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

Commit b8ddb69

Browse files
AndreasOpenModelica-Hudson
authored andcommitted
Added dependency for CPP runtime on Windows mingw build
- Now runnig make -f Makefile.omdev.mingw runtimeCPPinstall works Belonging to [master]: - #2816
1 parent 3fa798f commit b8ddb69

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile.common

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ all-runtimeCPPinstall: CMinpack sundials
218218
omc-and-runtimeCPPinstall: CMinpack sundials
219219
$(MAKE) omc runtimeCPPinstall OMBUILDDIR=$(OMBUILDDIR)
220220

221-
runtimeCPP: CMinpack sundials antlr-copy $(MINGW_EXTRA_LIBS)
221+
runtimeCPP: CMinpack sundials antlr-copy $(MINGW_EXTRA_LIBS) omc
222222
$(MAKE) -C SimulationRuntime/cpp/ -f $(defaultMakefileTarget) OMBUILDDIR=$(OMBUILDDIR)
223223

224224
CMAKE_ARGS=$(filter CMAKE_%, $(MAKEFLAGS))
@@ -227,7 +227,7 @@ CMAKE_ARGS=$(filter CMAKE_%, $(MAKEFLAGS))
227227
omcCAPIinstall:
228228
$(MAKE) -C SimulationRuntime/cpp/ -f $(defaultMakefileTarget) omcCAPIinstall CC="$(CC)" CXX="$(CXX)" $(CMAKE_ARGS) OMBUILDDIR=$(OMBUILDDIR)
229229

230-
runtimeCPPinstall: CMinpack sundials
230+
runtimeCPPinstall: runtimeCPP
231231
$(MAKE) -C SimulationRuntime/cpp/ -f $(defaultMakefileTarget) CC="$(CC)" CXX="$(CXX)" install ANALYZATION_MODE="$(ANALYZATION_MODE)" $(CMAKE_ARGS) OMBUILDDIR=$(OMBUILDDIR)
232232
test ! `uname` = Darwin || install_name_tool -id @rpath/cpp/libOMCppCVode.dylib $(OMBUILDDIR)/$(LIB_OMC)/cpp/libOMCppCVode.dylib
233233
test ! `uname` = Darwin || install_name_tool -id @rpath/cpp/libOMCppDataExchange.dylib $(OMBUILDDIR)/$(LIB_OMC)/cpp/libOMCppDataExchange.dylib

0 commit comments

Comments
 (0)