- update CMakeFiles

- simulation_init.cpp -> simulation_init.c git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@10405 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Nov 10, 2011 · 6aa3db7 · 6aa3db7
1 parent a9d22fb
commit 6aa3db7
Show file tree

Hide file tree

Showing 8 changed files with 162 additions and 131 deletions.
diff --git a/SimulationRuntime/c/CMakeLists.txt b/SimulationRuntime/c/CMakeLists.txt
@@ -92,7 +92,7 @@ MACRO(BUILDMODEL model dir Flags CSRC)
   ADD_CUSTOM_TARGET(${model}codegen ALL DEPENDS ${OMC_OUTPUT})
 
   ADD_EXECUTABLE(${model} ${OMC_OUTPUT} ${CSRC})
-  TARGET_LINK_LIBRARIES(${model} sim c_runtime f2c meta sendData ModelicaExternalC libexpat)
+  TARGET_LINK_LIBRARIES(${model} simulation sim c_runtime f2c meta sendData ModelicaExternalC libexpat)
 
   # Dependencies
   ADD_DEPENDENCIES(${model} ${model}codegen)
@@ -153,7 +153,7 @@ MACRO(BUILDMODELMOS model mos Flags CSRC)
 
   ADD_DEFINITIONS(/TP ${model}.c)
   ADD_EXECUTABLE(${model} ${OMC_OUTPUT} ${CSRC})
-  TARGET_LINK_LIBRARIES(${model} util math-support results solver f2c meta sendData ModelicaExternalC libexpat)
+  TARGET_LINK_LIBRARIES(${model} simulation util math-support results solver f2c meta sendData ModelicaExternalC libexpat)
 
   # Dependencies
   ADD_DEPENDENCIES(${model} ${model}codegen)

diff --git a/SimulationRuntime/c/ModelicaExternalC/CMakeLists.txt b/SimulationRuntime/c/ModelicaExternalC/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Sources and Headers
 set(ModelicaExternalC_sources ModelicaInternal.c
                               ModelicaStrings.c 
-							  ModelicaTablesImpl.c)
-#							  tables.cpp
+							  ModelicaTablesImpl.c
+							  tables.cpp)
 #							  ModelicaUtilities.c)
 
-SET(ModelicaExternalC_headers ModelicaTables.h)
-#                              tables.h
+SET(ModelicaExternalC_headers ModelicaTables.h
+                              tables.h)
 #							  ModelicaUtilities.h) 
 
 # Library ModelicaExternalC

diff --git a/SimulationRuntime/c/build_mingw_libs.bat b/SimulationRuntime/c/build_mingw_libs.bat
@@ -12,7 +12,7 @@ del ..\..\mosh\src\options.o *.o *.a
 pushd ..\..\mosh\src
 g++ -O3 -c options.cpp
 popd
-mingw32-make -f Makefile.omdev.mingw
+mingw32-make -f Makefile.omdev.mingw %1
 pause
 rem del ..\..\mosh\src\options.o *.o
 rem del interactive\*.o

diff --git a/SimulationRuntime/c/simulation/CMakeLists.txt b/SimulationRuntime/c/simulation/CMakeLists.txt
@@ -17,6 +17,7 @@ SET(simulation_headers  simulation_input_xml.h simulation_runtime.h
 					options.h ../linearization/linearize.h)				 
 
 # Library util
+ADD_DEFINITIONS(/DNO_INTERACTIVE_DEPENDENCY)
 ADD_LIBRARY(simulation ${simulation_sources} ${simulation_headers})
 #TARGET_LINK_LIBRARIES(util)
 

diff --git a/SimulationRuntime/c/simulation/math-support/CMakeLists.txt b/SimulationRuntime/c/simulation/math-support/CMakeLists.txt
@@ -6,7 +6,7 @@ SET(math_support_sources  bigden.c enorm.c hybrd1.c nelmead.c qform.c r1updt.c
                   biglag.c dogleg.c fdjac1.c hybrj.c newuoa.c qrfac.c trsapp.c
 				  dpmpar.c hybrd.c lsame.c newuob.c r1mpyq.c update.c
 				  simulation_events.cpp simulation_delay.cpp
-				  simulation_init.cpp dgesv_aux.c )
+				  simulation_init.cpp dgesv_aux.c ringbuffer.c )
 
 SET(math_support_headers  blaswrap.h matrix.h ringbuffer.h simulation_delay.h
                   simulation_events.h simulation_init.h)