fix for debug msvc cpp runtime build

OpenModelica · May 21, 2015 · 8a7b5a0 · 8a7b5a0
1 parent 1b90621
commit 8a7b5a0
Show file tree

Hide file tree

Showing 18 changed files with 20 additions and 61 deletions.
diff --git a/3rdParty b/3rdParty
diff --git a/Compiler/Template/CodegenCpp.tpl b/Compiler/Template/CodegenCpp.tpl
@@ -466,10 +466,6 @@ template simulationFactoryFile(SimCode simCode ,Text& extraFuncs,Text& extraFunc
 match simCode
 case SIMCODE(modelInfo=MODELINFO()) then
   <<
-  /* #include <Core/Modelica.h>
-  #include <Core/ModelicaDefine.h>
-  #include "OMCpp<%fileNamePrefix%>Extension.h" */
-
   #if defined(__TRICORE__) || defined(__vxworks)
   #include <Core/System/FactoryExport.h>
   #include <Core/DataExchange/SimData.h>
@@ -534,9 +530,6 @@ template simulationInitCppFile(SimCode simCode ,Text& extraFuncs,Text& extraFunc
 match simCode
 case SIMCODE(modelInfo = MODELINFO(__)) then
    <<
-   /* #include <Core/Modelica.h>
-   #include <Core/ModelicaDefine.h>
-   #include "OMCpp<%fileNamePrefix%>Initialize.h" */
    #include <Core/System/EventHandling.h>
    #include <Core/System/DiscreteEvents.h>
    <%algloopfilesInclude(listAppend(allEquations,initialEquations),simCode , &extraFuncs , &extraFuncsDecl,  extraFuncsNamespace)%>
@@ -679,9 +672,7 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
     initialAnalyticJacobians(jacIndex, mat, vars, name, sparsepattern, colorList,simCode , &extraFuncs , &extraFuncsDecl,  extraFuncsNamespace)
     ;separator="";empty)
    <<
-   /* #include <Core/Modelica.h>
-   #include <Core/ModelicaDefine.h>
-   #include "OMCpp<%fileNamePrefix%>Jacobian.h" */
+
    <% (jacobianMatrixes |> (mat, _, _, _, _, _, _) hasindex index0 =>
        (mat |> (eqs,_,_) =>  algloopfilesInclude(eqs,simCode , &extraFuncs , &extraFuncsDecl,  extraFuncsNamespace) ;separator="")
      ;separator="")
@@ -720,9 +711,7 @@ template simulationStateSelectionCppFile(SimCode simCode, Text& extraFuncs, Text
 match simCode
 case SIMCODE(modelInfo = MODELINFO(__)) then
    <<
-   /* #include <Core/Modelica.h>
-   #include <Core/ModelicaDefine.h>
-   #include "OMCpp<%fileNamePrefix%>StateSelection.h" */
+
    <%lastIdentOfPath(modelInfo.name)%>StateSelection::<%lastIdentOfPath(modelInfo.name)%>StateSelection(IGlobalSettings* globalSettings, boost::shared_ptr<IAlgLoopSolverFactory> nonlinsolverfactory, boost::shared_ptr<ISimData> sim_data, boost::shared_ptr<ISimVars> sim_vars)
        : <%lastIdentOfPath(modelInfo.name)%>(globalSettings, nonlinsolverfactory, sim_data,sim_vars)
    {
@@ -744,9 +733,7 @@ template simulationWriteOutputCppFile(SimCode simCode ,Text& extraFuncs,Text& ex
 match simCode
 case SIMCODE(modelInfo = MODELINFO(__)) then
    <<
-   /* #include <Core/Modelica.h>
-   #include <Core/ModelicaDefine.h>
-   #include "OMCpp<%fileNamePrefix%>WriteOutput.h" */
+
 
    <%lastIdentOfPath(modelInfo.name)%>WriteOutput::<%lastIdentOfPath(modelInfo.name)%>WriteOutput(IGlobalSettings* globalSettings, boost::shared_ptr<IAlgLoopSolverFactory> nonlinsolverfactory, boost::shared_ptr<ISimData> sim_data, boost::shared_ptr<ISimVars> sim_vars)
        : <%lastIdentOfPath(modelInfo.name)%>(globalSettings, nonlinsolverfactory, sim_data,sim_vars)
@@ -989,9 +976,7 @@ match simCode
 case SIMCODE(modelInfo = MODELINFO(vars=SIMVARS(__))) then
   let classname = lastIdentOfPath(modelInfo.name)
    <<
-   /* #include <Core/Modelica.h>
-   #include <Core/ModelicaDefine.h>
-   #include "OMCpp<%fileNamePrefix%>Extension.h" */
+
    <%classname%>Extension::<%classname%>Extension(IGlobalSettings* globalSettings, boost::shared_ptr<IAlgLoopSolverFactory> nonlinsolverfactory, boost::shared_ptr<ISimData> sim_data, boost::shared_ptr<ISimVars> sim_vars)
        : <%classname%>(globalSettings, nonlinsolverfactory, sim_data,sim_vars)
        , <%classname%>WriteOutput(globalSettings,nonlinsolverfactory, sim_data,sim_vars)
@@ -2168,10 +2153,8 @@ template calcHelperMainfile(SimCode simCode ,Text& extraFuncs,Text& extraFuncsDe
     * This file is generated by the OpenModelica Compiler and produced to speed-up the compile time.
     *
     *****************************************************************************/
-
-    #include <Core/Modelica.h>
     #include <Core/ModelicaDefine.h>
-
+    #include <Core/Modelica.h>
     #include "OMCpp<%fileNamePrefix%>Types.h"
     #include "OMCpp<%fileNamePrefix%>Extension.h"
     #include "OMCpp<%fileNamePrefix%>Extension.cpp"
@@ -2192,9 +2175,9 @@ template calcHelperMainfile2(SimCode simCode ,Text& extraFuncs,Text& extraFuncsD
     * This file is generated by the OpenModelica Compiler and produced to speed-up the compile time.
     *
     *****************************************************************************/
-
-    #include <Core/Modelica.h>
     #include <Core/ModelicaDefine.h>
+    #include <Core/Modelica.h>
+
 
     #include "OMCpp<%fileNamePrefix%>Types.h"
     #include "OMCpp<%fileNamePrefix%>Extension.h"
@@ -2218,9 +2201,9 @@ template calcHelperMainfile3(SimCode simCode ,Text& extraFuncs,Text& extraFuncsD
     * This file is generated by the OpenModelica Compiler and produced to speed-up the compile time.
     *
     *****************************************************************************/
-
-    #include <Core/Modelica.h>
     #include <Core/ModelicaDefine.h>
+    #include <Core/Modelica.h>
+
 
     #include "OMCpp<%fileNamePrefix%>Types.h"
     #include "OMCpp<%fileNamePrefix%>Functions.h"
@@ -2242,9 +2225,9 @@ template calcHelperMainfile4(SimCode simCode ,Text& extraFuncs,Text& extraFuncsD
     * This file is generated by the OpenModelica Compiler and produced to speed-up the compile time.
     *
     *****************************************************************************/
-
-    #include <Core/Modelica.h>
     #include <Core/ModelicaDefine.h>
+    #include <Core/Modelica.h>
+
 
     #include "OMCpp<%fileNamePrefix%>Types.h"
     #include "OMCpp<%fileNamePrefix%>Functions.h"
@@ -2268,9 +2251,9 @@ template calcHelperMainfile5(SimCode simCode ,Text& extraFuncs,Text& extraFuncsD
     * This file is generated by the OpenModelica Compiler and produced to speed-up the compile time.
     *
     *****************************************************************************/
-
-    #include <Core/Modelica.h>
     #include <Core/ModelicaDefine.h>
+    #include <Core/Modelica.h>
+
 
     #include "OMCpp<%fileNamePrefix%>Types.h"
     #include "OMCpp<%fileNamePrefix%>Functions.h"
@@ -2301,9 +2284,7 @@ template simulationFunctionsFile(SimCode simCode, Text& extraFuncs, Text& extraF
 match simCode
 case SIMCODE(modelInfo=MODELINFO(__)) then
   <<
-  /* #include <Core/Modelica.h>
-  #include <Core/ModelicaDefine.h>
-  #include "OMCpp<%fileNamePrefix%>Functions.h" */
+
 
   <%externalFunctionIncludes(includes)%>
 
@@ -3289,11 +3270,7 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
 match eq
     case SES_LINEAR(lSystem = ls as LINEARSYSTEM(__)) then
    <<
-   /* #include <Core/Modelica.h>
-   #include <Core/ModelicaDefine.h>
-   #include "OMCpp<%fileNamePrefix%>Extension.h"
-   #include "OMCpp<%filename%>Algloop<%ls.index%>.h"
-   #include "OMCpp<%modelfilename%>.h" */
+
    <%if Flags.isSet(Flags.WRITE_TO_BUFFER) then '#include "Math/ArrayOperations.h"'%>
 
 
@@ -3355,11 +3332,7 @@ match eq
 
     case SES_NONLINEAR(nlSystem = nls as NONLINEARSYSTEM(__)) then
    <<
-   /* #include <Core/Modelica.h>
-   #include <Core/ModelicaDefine.h>
-   #include "OMCpp<%fileNamePrefix%>Extension.h"
-   #include "OMCpp<%filename%>Algloop<%nls.index%>.h"
-   #include "OMCpp<%modelfilename%>.h" */
+
    <%if Flags.isSet(Flags.WRITE_TO_BUFFER) then '#include "Math/ArrayOperations.h"'%>
 
 

diff --git a/SimulationRuntime/cpp/Core/Solver/FactoryExport.cpp b/SimulationRuntime/cpp/Core/Solver/FactoryExport.cpp
@@ -1,6 +1,5 @@
 /** @addtogroup coreSolver
  *  
- *  More documentation for the first group.
  *  @{
  */
 #include <Core/ModelicaDefine.h>

diff --git a/SimulationRuntime/cpp/Core/Solver/SimulationMonitor.cpp b/SimulationRuntime/cpp/Core/Solver/SimulationMonitor.cpp
@@ -1,6 +1,5 @@
 /** @addtogroup coreSolver
  *  
- *  More documentation for the first group.
  *  @{
  */
 #include <Core/ModelicaDefine.h>

diff --git a/SimulationRuntime/cpp/Core/Solver/SolverDefaultImplementation.cpp b/SimulationRuntime/cpp/Core/Solver/SolverDefaultImplementation.cpp
@@ -1,6 +1,5 @@
 /** @addtogroup coreSolver
  *  
- *  More documentation for the first group.
  *  @{
  */
 #include <Core/ModelicaDefine.h>

diff --git a/SimulationRuntime/cpp/Core/Solver/SolverSettings.cpp b/SimulationRuntime/cpp/Core/Solver/SolverSettings.cpp
@@ -1,6 +1,5 @@
 /** @addtogroup coreSolver
  *  
- *  More documentation for the first group.
  *  @{
  */
 #include <Core/ModelicaDefine.h>

diff --git a/SimulationRuntime/cpp/Core/Solver/SystemStateSelection.cpp b/SimulationRuntime/cpp/Core/Solver/SystemStateSelection.cpp
@@ -1,6 +1,5 @@
 /** @addtogroup coreSolver
  *  
- *  More documentation for the first group.
  *  @{
  */
 #include <Core/ModelicaDefine.h>

diff --git a/SimulationRuntime/cpp/Include/Core/Solver/IAlgLoopSolver.h b/SimulationRuntime/cpp/Include/Core/Solver/IAlgLoopSolver.h
@@ -1,7 +1,6 @@
 #pragma once
 /** @addtogroup coreSolver
  *  
- *  More documentation for the first group.
  *  @{
  */
 class IAlgLoop;

diff --git a/SimulationRuntime/cpp/Include/Core/Solver/ILinSolverSettings.h b/SimulationRuntime/cpp/Include/Core/Solver/ILinSolverSettings.h
@@ -1,7 +1,6 @@
 #pragma once
 /** @addtogroup coreSolver
  *  
- *  More documentation for the first group.
  *  @{
  */
 

diff --git a/SimulationRuntime/cpp/Include/Core/Solver/INonLinSolverSettings.h b/SimulationRuntime/cpp/Include/Core/Solver/INonLinSolverSettings.h
@@ -1,7 +1,6 @@
 #pragma once
 /** @addtogroup coreSolver
  *  
- *  More documentation for the first group.
  *  @{
  */
 /*****************************************************************************/

diff --git a/SimulationRuntime/cpp/Include/Core/Solver/ISolver.h b/SimulationRuntime/cpp/Include/Core/Solver/ISolver.h
@@ -1,7 +1,6 @@
 #pragma once
 /** @addtogroup coreSolver
  *  
- *  More documentation for the first group.
  *  @{
  */
 /*****************************************************************************/

diff --git a/SimulationRuntime/cpp/Include/Core/Solver/ISolverSettings.h b/SimulationRuntime/cpp/Include/Core/Solver/ISolverSettings.h
@@ -1,7 +1,6 @@
 #pragma once
 /** @addtogroup coreSolver
  *  
- *  More documentation for the first group.
  *  @{
  */
 

diff --git a/SimulationRuntime/cpp/Include/Core/Solver/SimulationMonitor.h b/SimulationRuntime/cpp/Include/Core/Solver/SimulationMonitor.h
@@ -1,7 +1,6 @@
 #pragma once
 /** @addtogroup coreSolver
  *  
- *  More documentation for the first group.
  *  @{
  */
 #if defined(__vxworks) || defined (__TRICORE__)

diff --git a/SimulationRuntime/cpp/Include/Core/Solver/SolverDefaultImplementation.h b/SimulationRuntime/cpp/Include/Core/Solver/SolverDefaultImplementation.h
@@ -1,7 +1,6 @@
 #pragma once
 /** @addtogroup coreSolver
  *  
- *  More documentation for the first group.
  *  @{
  */
 #include <Core/Solver/SystemStateSelection.h>

diff --git a/SimulationRuntime/cpp/Include/Core/Solver/SolverSettings.h b/SimulationRuntime/cpp/Include/Core/Solver/SolverSettings.h
@@ -1,7 +1,6 @@
 #pragma once
 /** @addtogroup coreSolver
  *  
- *  More documentation for the first group.
  *  @{
  */
 

diff --git a/SimulationRuntime/cpp/Include/Core/Solver/SystemStateSelection.h b/SimulationRuntime/cpp/Include/Core/Solver/SystemStateSelection.h
@@ -1,7 +1,6 @@
 #pragma once
 /** @addtogroup coreSolver
  *  
- *  More documentation for the first group.
  *  @{
  */
 #if defined(__TRICORE__) || defined(__vxworks)

diff --git a/SimulationRuntime/cpp/Makefile.omdev.mingw b/SimulationRuntime/cpp/Makefile.omdev.mingw
@@ -9,9 +9,9 @@ builddir_lib=$(OMBUILDDIR)/lib/omc
 builddir_inc=$(OMBUILDDIR)/include/omc
 
 #use this call to use precompiled headers
-BUILDTPYE = Release
+#BUILDTPYE = Release
 #use this call if you want to debug the cpp runtime
-#BUILDTPYE = Debug
+BUILDTPYE = Debug
 
 CMAKE = $(OMDEV)/bin/cmake/bin/cmake -DCMAKE_VERBOSE_MAKEFILE:Bool=ON
 

diff --git a/common b/common