Skip to content

Commit

Permalink
Compilation --without-UMFPACK is now working
Browse files Browse the repository at this point in the history
  • Loading branch information
sjoelund committed May 4, 2015
1 parent ae1c524 commit 623a477
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
2 changes: 1 addition & 1 deletion 3rdParty
Submodule 3rdParty updated 387 files
11 changes: 10 additions & 1 deletion Makefile.common
Expand Up @@ -71,7 +71,7 @@ $(builddir_share)/omc/omc_communication.idl: Compiler/runtime/omc_communication.
cp -a "$<" "$@"
idl: $(builddir_share)/omc/omc_communication.idl

interactive-common: .testvariables mkbuilddirs boehm-gc idl
interactive-common: .testvariables mkbuilddirs boehm-gc idl ModelicaExternalC

interactive-short: .testvariables interactive-common
$(MAKE) -C SimulationRuntime/c -f $(defaultMakefileTarget) bootstrap-dependencies
Expand Down Expand Up @@ -389,3 +389,12 @@ graphstream-clean:

sanity-check: omc
build/bin/omc Examples/SanityCheck.mos

MODELICAEXTERNALC=3rdParty/ModelicaExternalC
ModelicaExternalC: $(LIBMODELICAEXTERNALC) $(LIBMODELICASTANDARDTABLES)
$(LIBMODELICAEXTERNALC):
(cd "$(MODELICAEXTERNALC)/BuildProjects/autotools" && (test -f Makefile || ./autogen.sh))
(cd "$(MODELICAEXTERNALC)/BuildProjects/autotools" && (test -f Makefile || (./configure ${MSL321_CONFIG_EXTRA_FLAGS} "--host=$(host)" --libdir="`cd ../../../../build/$(LIB_OMC)/ && pwd -P || echo ERROR-BAD-INSTALL-PATH`" CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(MSL_EXTRA_ARGS) && $(MAKE) clean)))
$(MAKE) -C "$(MODELICAEXTERNALC)/BuildProjects/autotools"
$(MAKE) -C "$(MODELICAEXTERNALC)/BuildProjects/autotools" install
$(LIBMODELICASTANDARDTABLES): $(LIBMODELICAEXTERNALC)
3 changes: 2 additions & 1 deletion Makefile.in
Expand Up @@ -56,6 +56,8 @@ ifeq ($(WITH_FMIL),yes)
BOOTSTRAP_FMIL_DEP=fmil
endif
LIB_OMC=lib/@host_short@/omc
LIBMODELICAEXTERNALC=build/lib/@host_short@/omc/libModelicaExternalC@SHREXT@
LIBMODELICASTANDARDTABLES=build/lib/@host_short@/omc/libModelicaStandardTables@SHREXT@

include Makefile.common

Expand Down Expand Up @@ -143,7 +145,6 @@ endif
omc-bootstrapped:
$(MAKE) bootstrap-dependencies interactive sim-dependencies
$(MAKE) -C Compiler/boot
$(MAKE) omlibrary

omc-no-sim:
$(MAKE) bootstrap-dependencies interactive-short
Expand Down

0 comments on commit 623a477

Please sign in to comment.