Skip to content

Commit

Permalink
attempt to make the windows compilation more robust
Browse files Browse the repository at this point in the history
  • Loading branch information
adrpo authored and OpenModelica-Hudson committed Dec 8, 2016
1 parent 2395ff7 commit f25b1b5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile.common
Expand Up @@ -69,7 +69,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 ModelicaExternalC
interactive-common: .testvariables mkbuilddirs boehm-gc idl ModelicaExternalC $(MINGW_EXTRA_LIBS)

interactive-short: .testvariables interactive-common
$(MAKE) -C SimulationRuntime/c -f $(defaultMakefileTarget) bootstrap-dependencies OMBUILDDIR=$(OMBUILDDIR)
Expand Down Expand Up @@ -405,7 +405,7 @@ graphstream-clean:

# build lpsolve
lpsolve: 3rdParty/lpsolve/Makefile
$(MAKE) -C 3rdParty/lpsolve/ install CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)"
$(MAKE) -C 3rdParty/lpsolve/ install CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" -j1
cp -pf 3rdParty/lpsolve/build/lib/liblpsolve55* $(builddir_lib_omc)
cp -prf 3rdParty/lpsolve/build/include/* $(builddir_inc)/
3rdParty/lpsolve/Makefile: 3rdParty/lpsolve/configure.ac
Expand Down

0 comments on commit f25b1b5

Please sign in to comment.