Skip to content
This repository was archived by the owner on May 18, 2019. It is now read-only.

Commit e13c1c3

Browse files
adrpoOpenModelica-Hudson
authored andcommitted
attempt to fix MacOS builds
- depend OMSI on fmil as well Belonging to [master]: - #3002
1 parent ab4e3e6 commit e13c1c3

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Makefile.common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ $(builddir_share)/omc/omc_communication.idl: Compiler/runtime/omc_communication.
107107
cp -a "$<" "$@"
108108
idl: $(builddir_share)/omc/omc_communication.idl
109109

110-
interactive-common: .testvariables boehm-gc idl ModelicaExternalC antlr-copy $(MINGW_EXTRA_LIBS)
110+
interactive-common: .testvariables boehm-gc idl ModelicaExternalC antlr-copy $(MINGW_EXTRA_LIBS) OMSI
111111

112112
interactive-short: .testvariables interactive-common
113113
$(MAKE) -C SimulationRuntime/c -f $(defaultMakefileTarget) bootstrap-dependencies OMBUILDDIR=$(OMBUILDDIR)

Makefile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ include Makefile.omsi.common
8181
settings:
8282

8383
ifeq ($(OMENCRYPTION),yes)
84-
omc: semla omc-bootstrapped OMSI
84+
omc: semla omc-bootstrapped
8585
else
86-
omc: omc-bootstrapped OMSI
86+
omc: omc-bootstrapped
8787
endif
8888

8989
boehm-gc-lib: @LIBGC@

Makefile.omsi.common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ OMSI-clean: OMSIBaseClean
2929
# Rules for OMSIBase library
3030
#############################
3131

32-
OMSIBase: sundials
32+
OMSIBase: sundials fmil
3333
cd SimulationRuntime/OMSI; \
3434
$(foreach PLATFORM, $(PLATFORMS), \
3535
mkdir -p Build_$(PLATFORM); \

0 commit comments

Comments
 (0)