Skip to content

Commit

Permalink
- attempt to fix Windows build
Browse files Browse the repository at this point in the history
  * remove coinmetis from the link flags
  * make sure you remove Ipopt-3.11.6/Makefile if there is no Ipopt-3.11.6/Ipopt/Makefile so configure is ran again!


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20661 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adrpo committed May 17, 2014
1 parent 9a13618 commit fe1e65d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Compiler/runtime/config.h
Expand Up @@ -55,7 +55,7 @@
#endif

/* adrpo: add -loleaut32 as is used by ExternalMedia */
#define BASIC_LDFLAGS_RT " -lgc -lexpat -lregex -static-libgcc -luuid -loleaut32 -lole32 -lws2_32 -lsundials_kinsol -lsundials_nvecserial -lipopt -lcoinmumps -lcoinmetis -lpthread -lm -lgfortranbegin -lgfortran -lmingw32 -lgcc_eh -lmoldname -lmingwex -lmsvcrt -luser32 -lkernel32 -ladvapi32 -lshell32 -llapack-mingw -lcminpack -ltmglib-mingw -lblas-mingw -lf2c"
#define BASIC_LDFLAGS_RT " -lgc -lexpat -lregex -static-libgcc -luuid -loleaut32 -lole32 -lws2_32 -lsundials_kinsol -lsundials_nvecserial -lipopt -lcoinmumps -lpthread -lm -lgfortranbegin -lgfortran -lmingw32 -lgcc_eh -lmoldname -lmingwex -lmsvcrt -luser32 -lkernel32 -ladvapi32 -lshell32 -llapack-mingw -lcminpack -ltmglib-mingw -lblas-mingw -lf2c"
#define LDFLAGS_RT " -lOpenModelicaRuntimeC" BASIC_LDFLAGS_RT
#define LDFLAGS_RT_SIM " -lSimulationRuntimeC" BASIC_LDFLAGS_RT " -linteractive -lwsock32 -llis -lstdc++"
#define CONFIG_EXE_EXT ".exe"
Expand Down
2 changes: 2 additions & 0 deletions Makefile.common
Expand Up @@ -321,6 +321,8 @@ clean: qtclean fmil-clean opencl_rt_clean gc-clean lis-clean runtimeCPPclean CMi
(cd mosh/src && $(MAKE) -f $(defaultMakefileTarget) clean)
(cd PythonInterface && $(MAKE) -f $(defaultMakefileTarget) clean)
if test -f 3rdParty/modelica3d/build/Makefile; then $(MAKE) -C 3rdParty/modelica3d/build clean; fi
# remove Ipopt-3.11.6/Makefile if there is no Ipopt-3.11.6/Ipopt/Makefile to run configure again!
if test -f 3rdParty/Ipopt-3.11.6/Ipopt/Makefile; then rm -f 3rdParty/Ipopt-3.11.6/Makefile || true; fi
if test -f 3rdParty/Ipopt-3.11.6/Makefile; then $(MAKE) -C 3rdParty/Ipopt-3.11.6 distclean || true; fi
(rm -rf 3rdParty/modelica3d/build)
(rm -rf SimulationRuntime/build_c)
Expand Down

0 comments on commit fe1e65d

Please sign in to comment.