Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into pullrequest
Browse files Browse the repository at this point in the history
  • Loading branch information
@OpenModelica-Hudson
OpenModelica-Hudson committed Nov 27, 2016
2 parents d9f30dc + 407fc9c commit ce441e1
Show file tree
Hide file tree
Showing 11 changed files with 206 additions and 208 deletions.
8 changes: 4 additions & 4 deletions Compiler/Template/CodegenCpp.tpl
View file
Expand Up @@ -3099,8 +3099,8 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
# /link - [linker options and libraries]
# /LIBPATH: - Directories where libs can be found
#LDFLAGS=/MDd /link /DLL /NOENTRY /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/cpp/msvc" /LIBPATH:"<%makefileParams.omhome%>/bin" /LIBPATH:"$(BOOST_LIBS)" OMCppSystem.lib OMCppMath.lib
#LDSYSTEMFLAGS=/MD /Debug /link /DLL /NOENTRY /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/cpp/msvc" /LIBPATH:"<%makefileParams.omhome%>/bin" /LIBPATH:"$(BOOST_LIBS)" OMCppSystem.lib OMCppModelicaUtilities.lib OMCppMath.lib OMCppOMCFactory.lib
LDSYSTEMFLAGS= /link /DLL /NOENTRY /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/cpp/msvc" /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/msvc" /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/msvc/debug" /LIBPATH:"<%makefileParams.omhome%>/bin" /LIBPATH:"$(BOOST_LIBS)" OMCppSystem.lib OMCppModelicaUtilities.lib OMCppMath.lib OMCppDataExchange.lib OMCppOMCFactory.lib <%timeMeasureLink%>
#LDSYSTEMFLAGS=/MD /Debug /link /DLL /NOENTRY /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/cpp/msvc" /LIBPATH:"<%makefileParams.omhome%>/bin" /LIBPATH:"$(BOOST_LIBS)" OMCppSystem.lib OMCppModelicaUtilities.lib OMCppMath.lib OMCppOMCFactory.lib
LDSYSTEMFLAGS= /link /DLL /NOENTRY /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/cpp/msvc" /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/msvc" /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/msvc/debug" /LIBPATH:"<%makefileParams.omhome%>/bin" /LIBPATH:"$(BOOST_LIBS)" OMCppSystem.lib OMCppModelicaUtilities.lib OMCppMath.lib OMCppDataExchange.lib OMCppOMCFactory.lib <%timeMeasureLink%> WSock32.lib Ws2_32.lib
#LDMAINFLAGS=/MD /Debug /link /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/cpp/msvc" OMCppOMCFactory.lib /LIBPATH:"<%makefileParams.omhome%>/bin" /LIBPATH:"$(BOOST_LIBS)"
LDMAINFLAGS=/link /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/cpp/msvc" /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/msvc" OMCppOMCFactory.lib OMCppModelicaUtilities.lib <%timeMeasureLink%> /LIBPATH:"<%makefileParams.omhome%>/bin" /LIBPATH:"$(BOOST_LIBS)"
# /MDd link with MSVCRTD.LIB debug lib
Expand Down Expand Up @@ -3178,11 +3178,11 @@ case "gcc" then
CFLAGS_DYNAMIC=$(CFLAGS_COMMON)
CFLAGS_STATIC=$(CFLAGS_COMMON) <%staticIncludes%> -DRUNTIME_STATIC_LINKING -DENABLE_SUNDIALS_STATIC

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

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)
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"
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" <%if boolOr(stringEq(makefileParams.platform, "win32"),stringEq(makefileParams.platform, "win64")) then ' -lwsock32 -lws2_32 ' else ''%>

ifeq ($(USE_PAPI),ON)
$(eval LDMAINFLAGS_COMMON=$(LDMAINFLAGS_COMMON) <%papiLibs%>)
Expand Down
91 changes: 2 additions & 89 deletions Makefile.omdev.mingw
View file
Expand Up @@ -242,100 +242,13 @@ copycppheader:
echo Copying needed header files to the $(OMBUILDDIR)/include/omc/cpp directory
(mkdir -p $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -puf $(BOOST_PATH)/boost/*.hpp $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/algorithm $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/archive $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/assign $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/atomic $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/bind $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/circular_buffer $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/chrono $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/concept $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/config $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/container $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/detail $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/exception $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/date_time $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/filesystem $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/format $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/function $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/functional $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/integer $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/intrusive $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/io $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/iterator $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/math $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/move $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/mpl $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/multi_array $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/numeric $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/optional $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/predef $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/preprocessor $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/program_options $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/ptr_container $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/range $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/serialization $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/smart_ptr $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/system $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/ratio $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/thread $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/tuple $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/type_traits $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/typeof $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/unordered $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/utility $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/property_tree $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/multi_index $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/* $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)

copycppmsvcheader: getMSVCversion
echo Copying needed header files to the $(OMBUILDDIR)/include/omc/cpp/ directory
(mkdir -p $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -puf $(BOOST_PATH_MSVC)/boost/*.hpp $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/algorithm $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/archive $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/assign $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/atomic $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/bind $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/circular_buffer $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/chrono $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/concept $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/config $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/container $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/detail $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/exception $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/date_time $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/filesystem $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/format $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/function $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/functional $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/integer $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/intrusive $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/io $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/iterator $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/math $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/move $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/mpl $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/multi_array $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/numeric $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/optional $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/predef $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/preprocessor $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/program_options $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/ptr_container $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/range $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/serialization $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/smart_ptr $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/system $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/ratio $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/thread $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/tuple $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/type_traits $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/typeof $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/unordered $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/utility $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/property_tree $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/multi_index $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)

(cp -pufr $(BOOST_PATH_MSVC)/boost/* $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)

omc: mkbuilddirs interactive fmil omdev_extra_dlls breakprocess opencl_rt CMinpack metis Cdaskr $(IPOPT_TARGET) graphstream
(time $(MAKE) -f $(defaultMakefileTarget) CFLAGS="$(CFLAGS)" omc-bootstrapped OMBUILDDIR=$(OMBUILDDIR))
Expand Down
24 changes: 12 additions & 12 deletions SimulationRuntime/c/simulation/options.c
View file
Expand Up @@ -30,6 +30,7 @@

#include "options.h"
#include "util/omc_error.h"
#include "simulation_runtime.h"

#include <string.h>
#include <stdio.h>
Expand All @@ -47,30 +48,29 @@ int helpFlagSet(int argc, char** argv)
return flagSet("?", argc, argv) || flagSet("help", argc, argv);
}

#if !defined(OMC_MINIMAL_RUNTIME)
int setLogFormat(int argc, char** argv)
{
const char* value = getOption(FLAG_NAME[FLAG_LOG_FORMAT], argc, argv);
if(NULL == value)
if (NULL == value) {
value = getFlagValue(FLAG_NAME[FLAG_LOG_FORMAT], argc, argv);
}

if (NULL != value)
{
if (0 == strcmp(value, "xml"))
{
if (NULL != value) {
if (0 == strcmp(value, "xml")) {
setStreamPrintXML(1);
}
else if (0 == strcmp(value, "text"))
{
} else if (0 == strcmp(value, "xmltcp")) {
setStreamPrintXML(2);
} else if (0 == strcmp(value, "text")) {
setStreamPrintXML(0);
}
else
{
warningStreamPrint(LOG_STDOUT, 0, "invalid command line option: -logFormat=%s, expected text or xml", value);
} else {
warningStreamPrint(LOG_STDOUT, 0, "invalid command line option: -logFormat=%s, expected text, xml, or xmltcp", value);
return 1;
}
}
return 0;
}
#endif

int checkCommandLineArguments(int argc, char **argv)
{
Expand Down

0 comments on commit ce441e1

Please sign in to comment.