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

Commit

Permalink
Added dependency for CPP runtime on Windows mingw build
Browse files Browse the repository at this point in the history
  - Now runnig make -f Makefile.omdev.mingw runtimeCPPinstall works

Belonging to [master]:
  - #2816
  • Loading branch information
AnHeuermann authored and OpenModelica-Hudson committed Dec 14, 2018
1 parent 3fa798f commit b8ddb69
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile.common
Expand Up @@ -218,7 +218,7 @@ all-runtimeCPPinstall: CMinpack sundials
omc-and-runtimeCPPinstall: CMinpack sundials
$(MAKE) omc runtimeCPPinstall OMBUILDDIR=$(OMBUILDDIR)

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

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

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

0 comments on commit b8ddb69

Please sign in to comment.