extended make file to build cpp runtime with visual studio

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@13744 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 31, 2012 · 48fe5b8 · 48fe5b8
1 parent 58ad511
commit 48fe5b8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/Compiler/Template/CodegenCpp.tpl b/Compiler/Template/CodegenCpp.tpl
@@ -160,7 +160,7 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
   # /I - Include Directories
   # /DNOMINMAX - Define NOMINMAX (does what it says)
   # /TP - Use C++ Compiler
-  CFLAGS=/Od /EHa /fp:except /I"<%makefileParams.omhome%>/include/omc/cpp" -I"$(BOOST_INCLUDE)" /I. /DNOMINMAX /TP /DNO_INTERACTIVE_DEPENDENCY
+  CFLAGS=/Od /EHa /MP /fp:except /I"<%makefileParams.omhome%>/include/omc/cpp" -I"$(BOOST_INCLUDE)" /I. /DNOMINMAX /TP /DNO_INTERACTIVE_DEPENDENCY
 
   # /ZI enable Edit and Continue debug info 
   CDFLAGS = /ZI

diff --git a/Makefile.common b/Makefile.common
@@ -86,13 +86,14 @@ runtimeCPPinstall:
 	$(MAKE) -C SimulationRuntime/cpp/ -f $(defaultMakefileTarget) install
 	(time $(MAKE) -C testsuite/openmodelica/cppruntime -f Makefile)
 
+
 testlibrariemsl31cpp:
 	(cd testsuite/cppruntime/libraries/msl31 && time $(MAKE) -f Makefile > testsuite-msl31-cpp-trace.txt 2>&1)
 	echo "log is in testsuite/openmodelica/cppruntime/libraries/msl31/testsuite-msl31-cpp-trace.txt" 
 
 runtimeCPPclean: 
 	$(MAKE) -C SimulationRuntime/cpp/ -f $(defaultMakefileTarget) clean
-	
+
 fmil:
 	test -d 3rdParty/FMIL
 	mkdir -p 3rdParty/FMIL/build

diff --git a/SimulationRuntime/cpp/Makefile b/SimulationRuntime/cpp/Makefile
@@ -13,9 +13,12 @@ runtimeCpp:
 	cmake -D  CMAKE_INSTALL_PREFIX:PATH="$(builddir_build)"  ../Source; \
 	make
 
+
+
 install: runtimeCpp
 	(cd Build; make install)
 
+
 clean:
 	rm -R -f Build
 	mkdir Build
diff --git a/SimulationRuntime/cpp/Source/System/Modelica/CMakeLists.txt b/SimulationRuntime/cpp/Source/System/Modelica/CMakeLists.txt
@@ -10,7 +10,8 @@ target_link_libraries (${ModelicaName}  ${SystemName} ${ModelicaExternalCName}
 GET_TARGET_PROPERTY(libModelicaSystem ${ModelicaName} LOCATION)
 GET_FILENAME_COMPONENT(libModelicaSystemName ${libModelicaSystem} NAME)
 #set (BOOST_LIBS ${Boost})
-set (BOOS_INCLUDE ${Boost_INCLUDE_DIRS})
+set (BOOST_INCLUDE ${Boost_INCLUDE_DIRS})
+set (BOOST_LIBS ${Boost_LIB_DIRS})
 set (MODELICA_SYSTEM_LIB ${libModelicaSystemName})
  configure_file (
   "${PROJECT_SOURCE_DIR}/ModelicaConfic.inc.in"

diff --git a/SimulationRuntime/cpp/Source/System/Modelica/ModelicaConfic.inc.in b/SimulationRuntime/cpp/Source/System/Modelica/ModelicaConfic.inc.in
@@ -1,4 +1,4 @@
 
 BOOST_LIBS =  @BOOST_LIBS@
-BOOST_INCLUDE = @BOOS_INCLUDE@
+BOOST_INCLUDE = @BOOST_INCLUDE@
 MODELICA_SYSTEM_LIB = @MODELICA_SYSTEM_LIB@