Skip to content

Commit 24669b2

Browse files
adrpoOpenModelica-Hudson
authored andcommitted
fix ticket:3942
- use -std=c++11 for Windows - add -lz -lhdf5 libs to linking, needed for Modelica tables
1 parent 38e81d6 commit 24669b2

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

Compiler/Template/CodegenCpp.tpl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3210,7 +3210,8 @@ case "gcc" then
32103210
CFLAGS_DYNAMIC=$(CFLAGS_COMMON)
32113211
CFLAGS_STATIC=$(CFLAGS_COMMON) <%staticIncludes%> -DRUNTIME_STATIC_LINKING -DENABLE_SUNDIALS_STATIC
32123212

3213-
MODELICA_EXTERNAL_LIBS=-lModelicaExternalC -lModelicaStandardTables -L$(LAPACK_LIBS) $(LAPACK_LIBRARIES)
3213+
MINGW_EXTRA_LIBS=<%if boolOr(stringEq(makefileParams.platform, "win32"),stringEq(makefileParams.platform, "win64")) then ' -lz -lhdf5' else ''%>
3214+
MODELICA_EXTERNAL_LIBS=-lModelicaExternalC -lModelicaStandardTables -L$(LAPACK_LIBS) $(LAPACK_LIBRARIES) $(MINGW_EXTRA_LIBS)
32143215

32153216
LDSYSTEMFLAGS_COMMON=-L"$(OMHOME)/lib/<%getTriple()%>/omc/cpp" $(BASE_LIB) <%additionalLinkerFlags_GCC%> -Wl,-rpath,"$(OMHOME)/lib/<%getTriple()%>/omc/cpp" <%timeMeasureLink%> -L"$(BOOST_LIBS)" $(BOOST_LIBRARIES) $(LINUX_LIB_DL)
32163217
LDMAINFLAGS_COMMON=-L"$(OMHOME)/lib/<%getTriple()%>/omc/cpp" -L"$(OMHOME)/bin" -L"$(BOOST_LIBS)" $(BOOST_LIBRARIES) $(LINUX_LIB_DL) <%additionalLinkerFlags_GCC%> -Wl,-rpath,"$(OMHOME)/lib/<%getTriple()%>/omc/cpp"

SimulationRuntime/cpp/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@ IF(MSVC)
149149
ENDIF(MSVC)
150150
INCLUDE(${CMAKE_SOURCE_DIR}/PrecompiledHeader.cmake)
151151

152-
IF(IS_MINGW32 OR IS_MINGW64)
153-
SET(USE_CPP_03 ON)
154-
ENDIF(IS_MINGW32 OR IS_MINGW64)
152+
#IF(IS_MINGW32 OR IS_MINGW64)
153+
# SET(USE_CPP_03 ON)
154+
#ENDIF(IS_MINGW32 OR IS_MINGW64)
155155

156156
# Check C++11
157157
IF(NOT(USE_CPP_03))

0 commit comments

Comments
 (0)