fix windows builds after runtime changes

OpenModelica · Apr 16, 2016 · 2ac963a · 2ac963a
1 parent 0c33ef3
commit 2ac963a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/Compiler/boot/Makefile.common b/Compiler/boot/Makefile.common
@@ -34,12 +34,12 @@ PATCH_SOURCES=$(SED) -i 's/ = omc_assert_function/__attribute__((noreturn)) = om
 PATCHES := $(patsubst %.patch.xz,%.patch,$(wildcard patches/*.patch.xz))
 
 ifeq ($(BOOTSTRAP_STAGE_1),1)
-OMCRUNTIMEAR=../runtime/libomcruntime-boot$(SHREXT)
+OMCRUNTIMEAR=$(OMCRUNTIMEAR1)
 OMPARSEAR=../../Parser/libomparse-boot.a
 LOMPARSE=$(OMPARSEAR)
 LCOMPILERRUNTIME=$(abspath $(OMCRUNTIMEAR))
 else
-OMCRUNTIMEAR=$(OMHOME)/$(LIB_OMC)/libomcruntime$(SHREXT)
+OMCRUNTIMEAR=$(OMCRUNTIMEAR2)
 OMPARSEAR=$(OMHOME)/$(LIB_OMC)/libomparse.a
 LOMPARSE=-lomparse
 LCOMPILERRUNTIME=-lomcruntime

diff --git a/Compiler/boot/Makefile.in b/Compiler/boot/Makefile.in
@@ -28,6 +28,8 @@ RPATH=@RPATH@
 STATIC=@BOOTSTRAP_STATIC@
 BOOTSTRAP_OMC=@OMBUILDDIR@/bin/omc
 defaultMakefileTarget=Makefile
+OMCRUNTIMEAR1=../runtime/libomcruntime-boot$(SHREXT)
+OMCRUNTIMEAR2=$(OMHOME)/$(LIB_OMC)/libomcruntime$(SHREXT)
 
 
 default: all

diff --git a/Compiler/boot/Makefile.omdev.mingw b/Compiler/boot/Makefile.omdev.mingw
@@ -31,6 +31,9 @@ RPATH=
 BOOTSTRAP_OMC=$(OMBUILDDIR)/bin/omc.exe
 defaultMakefileTarget=Makefile.omdev.mingw
 LIB_OMC=lib/omc
+OMCRUNTIMEAR1=../runtime/libomcruntime-boot.a
+OMCRUNTIMEAR2=$(OMHOME)/$(LIB_OMC)/libomcruntime.a
+LDFLAGS_SHARED_MAIN=-L"$(OMHOME)/$(LIB_OMC)" $(EXTRA_LD_FLAGS)
 
 default: all
 

diff --git a/Compiler/runtime/Makefile.common b/Compiler/runtime/Makefile.common
@@ -73,6 +73,10 @@ libomcruntime-boot.so : $(OMC_OBJ)
 	rm -f $@
 	$(CXX) -shared $(RPATH) -o $@ $(OMC_OBJ) $(LDFLAGS)
 
+libomcruntime-boot.dll : $(OMC_OBJ)
+	rm -f $@
+	$(CXX) -shared $(RPATH) -o $@ $(OMC_OBJ) $(LDFLAGS)
+
 omc_communication.cc : omc_communication.idl
 	$(IDL) omc_communication.idl
 omc_communication.h: omc_communication.cc

diff --git a/Compiler/runtime/settingsimpl.c b/Compiler/runtime/settingsimpl.c
@@ -74,7 +74,7 @@ static void stripbinpath(char *omhome)
 #endif
 
 /* Do not free or modify the returned variable of getInstallationDirectoryPath. It's part of the environment! */
-#if defined(OPENMODELICA_BOOTSTRAPPING_STAGE_1)
+#if defined(OPENMODELICA_BOOTSTRAPPING_STAGE_1) && !(defined(_MSC_VER) || defined(__MINGW32__))
 const char* SettingsImpl__getInstallationDirectoryPath(void) {
   return CONFIG_DEFAULT_OPENMODELICAHOME;
 }