- fix #2989 (build shared compiler on Windows)

  * on Windows compile the main inside the lib so that all globals are used from the dll 
    (as in Windows the process and the loaded dll DO NOT SHARE the same global data)

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@23420 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: adrpo

Compiler/Template/CodegenC.tpl

@@ -11203,6 +11203,24 @@ let name = ("omc_" + underscorePath(entryPoint))
 <<
 /* This is an automatically generated entry point to a MetaModelica function */
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+#if defined(OMC_ENTRYPOINT_STATIC)
+
+#include <stdio.h>
+#include <openmodelica.h>
+
+DLLImport int __omc_main(int argc, char **argv);
+
+int main(int argc, char **argv)
+{
+  return __omc_main(argc, argv);
+}
+
+#else
+
 #include <meta/meta_modelica.h>
 #include <stdio.h>
 extern void <%name%>(threadData_t*,modelica_metatype);
@@ -11226,7 +11244,7 @@ static int rml_execution_failed()
   return 1;
 }
 
-int main(int argc, char **argv)
+DLLExport int __omc_main(int argc, char **argv)
 {
   MMC_INIT();
   {
@@ -11245,6 +11263,13 @@ int main(int argc, char **argv)
   EXIT(0);
   return 0;
 }
+
+#endif
+
+#if defined(__cplusplus)
+} /* end extern "C" */
+#endif
+
 >>
 end generateEntryPoint;
 

Compiler/boot/Makefile.common

@@ -95,21 +95,32 @@ $(GEN_DIR)%.stamp:
 $(GEN_DIR)_main.c:
 	$(OMC) GenerateEntryPoint.mos
 
-$(OMHOME)/lib/omc/libOpenModelicaCompiler$(SHREXT): $(ALL_OBJECTS) $(OMHOME)/lib/omc/libomcruntime.a $(OMHOME)/lib/omc/libomparse.a
+$(GEN_DIR)_main.o: $(GEN_DIR)_main.c
+	$(CC) -DOMC_ENTRYPOINT_STATIC= -c $(GEN_DIR)_main.c -o  $(GEN_DIR)_main.o $(CFLAGS) $(CPPFLAGS)
+
+$(GEN_DIR)_main_omc.c: $(GEN_DIR)_main.c
+	cp -a $^ $@
+
+$(GEN_DIR)_main_omc.o: $(GEN_DIR)_main_omc.c
+	$(CC) -c $(GEN_DIR)_main_omc.c -o  $(GEN_DIR)_main_omc.o $(CFLAGS) $(CPPFLAGS)
+
+$(OMHOME)/lib/omc/libOpenModelicaCompiler$(SHREXT): $(ALL_OBJECTS) $(OMHOME)/lib/omc/libomcruntime.a $(OMHOME)/lib/omc/libomparse.a $(GEN_DIR)_main_omc.o
 	@test ! -z "`echo $(ALL_OBJECTS)`" || (echo Empty dependencies for $@ ; false)
-	$(CC) -shared $(RPATH) $(INSTALL_NAME)  -o $@ $^ $(LDFLAGS)
-ifeq ($(STATIC),)
+	$(CC) -shared $(RPATH) $(INSTALL_NAME) -o $@ $^ $(LDFLAGS)
 
-$(GEN_DIR)omc$(EXE_EXT): $(OMHOME)/lib/omc/libOpenModelicaCompiler$(SHREXT) $(GEN_DIR)_main.o
+ifeq ($(STATIC),)
+#shared
+$(GEN_DIR)omc$(EXE_EXT): $(OMHOME)/lib/omc/libOpenModelicaCompiler$(SHREXT) $(GEN_DIR)_main_omc.o $(GEN_DIR)_main.o
 	$(CC) $(GEN_DIR)_main.o $(RPATH) $(CFLAGS) $(CPPFLAGS) -o $@ $(LDFLAGS) -lOpenModelicaCompiler
 install: $(GEN_DIR)omc$(EXE_EXT)
 	cp -a $< $(OMHOME)/bin/
+	cp -a $(OMHOME)/lib/omc/libOpenModelicaCompiler$(SHREXT) $(OMHOME)/bin/
 
 else
-
-$(GEN_DIR)omc$(EXE_EXT): $(ALL_OBJECTS) $(GEN_DIR)_main.o $(OMHOME)/lib/omc/libomcruntime.a $(OMHOME)/lib/omc/libomparse.a
+#static
+$(GEN_DIR)omc$(EXE_EXT): $(ALL_OBJECTS) $(GEN_DIR)_main.o $(GEN_DIR)_main_omc.o $(OMHOME)/lib/omc/libomcruntime.a $(OMHOME)/lib/omc/libomparse.a
 	@test ! -z "`echo $(ALL_OBJECTS)`" || (echo Empty dependencies for $@ ; false)
-	$(CC) $(GEN_DIR)_main.o $(RPATH) $(CFLAGS) $(CPPFLAGS) -o $@ $(ALL_OBJECTS) $(LDFLAGS)
+	$(CC) $(GEN_DIR)_main.o $(RPATH) $(CFLAGS) $(CPPFLAGS) -o $@ $(GEN_DIR)_main_omc.o $(ALL_OBJECTS) $(LDFLAGS)
 install: $(GEN_DIR)omc$(EXE_EXT)
 	cp -a $(GEN_DIR)omc$(EXE_EXT) $(OMHOME)/bin/