fix windows build

add omcCAPI build on Linux as well (commented out for now as there are some issues)

Belonging to [master]:
  - #2132

Author: adrpo

SimulationRuntime/cpp/Makefile.in

@@ -33,7 +33,7 @@ CMAKE_ARGS=$(patsubst CMAKE_%, -D%, $(filter CMAKE_%, $(MAKEFLAGS)))
 
 CMAKE_FLAGS=-DCMAKE_BUILD_TYPE=$(BUILDTYPE) $(BOOST_ROOT_COMMAND) $(BOOST_STATIC_LINKING_COMMAND) $(CPP_03_COMMAND) $(BOOST_REALPATHS_COMMAND) $(PARALLEL_OUTPUT_COMMAND) $(RUNTIME_PROFILING_COMMAND) $(SCOREP_COMMAND) $(FMU_SUNDIALS_COMMAND) $(LOGGER_COMMAND) -DCMAKE_BUILD_TYPE=$(BUILDTYPE) -DCMAKE_INSTALL_PREFIX:PATH="$(OMBUILDDIR)" -DLIBINSTALLEXT=$(LIBINSTALLEXT) -DSCOREP_HOME:STRING="$(SCOREP_HOME)" $(BUILD_DOC_COMMAND) $(CMAKE_ARGS) -DOpenMP_CXX_FLAGS="$(OMPCFLAGS)"
 
-runtimeCpp:
+runtimeCpp: # omcCAPIinstall
 	$(foreach PLATFORM, $(PLATFORMS), \
 	  mkdir -p Build_$(PLATFORM); \
 	  (cd ./Build_$(PLATFORM) && echo "change to Build_$(PLATFORM)" && $(CMAKE_COMMANDS) cmake -DPLATFORM=$(PLATFORM) $(CMAKE_FLAGS) ../); \
@@ -43,6 +43,14 @@ install: runtimeCpp
 	$(foreach PLATFORM, $(PLATFORMS), \
 	  (cd Build_$(PLATFORM); $(MAKE) install);)
 
+omcCAPIinstall:
+	mkdir -p Build_CAPI;
+	(cd ./Build_CAPI; echo "change to Build_CAPI"; \
+	  $(CMAKE_COMMANDS) cmake -DPLATFORM=$(PLATFORM) -DOMC_PATH="$(OMBUILDDIR)" $(CMAKE_FLAGS) ../omcCAPI/; \
+	  $(MAKE) install;)
+	(cp -puf Build_CAPI/lib/* $(OMBUILDDIR)/lib/omc/)
+	(cp -puf Build_CAPI/lib/*.so $(OMBUILDDIR)/bin/)
+
 clean:
 	$(foreach PLATFORM, $(PLATFORMS), \
 	  rm -R -f Build_$(PLATFORM);)

SimulationRuntime/cpp/omcCAPI/include/OMCFunctions.h

@@ -20,7 +20,7 @@ void (*omc_assert)(threadData_t*,FILE_INFO info,const char *msg,...) __attribute
 void (*omc_assert_warning)(FILE_INFO info,const char *msg,...) = omc_assert_warning_function;
 void (*omc_terminate)(FILE_INFO info,const char *msg,...) = omc_terminate_function;
 void (*omc_throw)(threadData_t*) __attribute__ ((noreturn)) = omc_throw_function;
-int omc_Main_handleCommand(void *threadData, void *imsg, void *ist, void **omsg, void **ost);
+int omc_Main_handleCommand(void *threadData, void *imsg, void **omsg);
 void* omc_Main_init(void *threadData, void *args);
 void* omc_Main_readSettings(void *threadData, void *args);
 #ifdef WIN32

SimulationRuntime/cpp/omcCAPI/src/OMC.cpp

@@ -187,7 +187,7 @@ extern "C" {
 		void *reply_str = NULL;
 		MMC_TRY_TOP_INTERNAL()
 			MMC_TRY_STACK()
-			if (!omc_Main_handleCommand(threadData, mmc_mk_scon(expression), omcPtr->st, &reply_str, &omcPtr->st))
+			if (!omc_Main_handleCommand(threadData, mmc_mk_scon(expression), &reply_str))
 			{
 				return -1;
 			}