- fix Windows build, for now C FMUs are broken

OpenModelica · Nov 11, 2015 · 36cabee · 36cabee
1 parent f401b32
commit 36cabee
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/SimulationRuntime/c/Makefile.common b/SimulationRuntime/c/Makefile.common
@@ -254,7 +254,7 @@ sourcedist: sourcedist1 sourcedist2
 sourcedist1:
 	$(MAKE) -f $(LIBMAKEFILE) OMC_MINIMAL_RUNTIME=1 OMC_FMI_RUNTIME=1 sourcedist_internal
 sourcedist2:
-	$(MAKE) -C ../fmi/export/buildproject
+	$(MAKE) -C ../fmi/export/buildproject -f $(defaultMakefileTarget)
 
 sourcedist_internal:
 	mkdir -p $(builddir_inc)/c/external_solvers external_solvers

diff --git a/SimulationRuntime/c/Makefile.in b/SimulationRuntime/c/Makefile.in
@@ -30,6 +30,8 @@ LDFLAGS=-L$(OMBUILDDIR)/lib/@host_short@/omc @RT_LDFLAGS@
 LDFLAGS_SIM=-L$(OMBUILDDIR)/lib/@host_short@/omc @RT_LDFLAGS_SIM@
 endif
 
+defaultMakefileTarget = Makefile
+
 LIBMAKEFILE = Makefile
 QMAKE=@QMAKE@
 CONFIG_H=$(top_builddir)/Compiler/runtime/config.h $(top_builddir)/Compiler/runtime/config.unix.h

diff --git a/SimulationRuntime/c/Makefile.omdev.mingw b/SimulationRuntime/c/Makefile.omdev.mingw
@@ -31,6 +31,9 @@ CONFIG_H=$(top_builddir)/Compiler/runtime/config.h
 LIBSIMULATION=libSimulationRuntimeC.a
 LIBRUNTIME=libOpenModelicaRuntimeC.a
 LIBFMIRUNTIME=libOpenModelicaFMIRuntimeC.a
-OBJ_EXT = .o
+OBJ_EXT=.o
+
+defaultMakefileTarget = Makefile.omdev.mingw
 
 include Makefile.common
+
diff --git a/SimulationRuntime/fmi/export/buildproject/Makefile.omdev.mingw b/SimulationRuntime/fmi/export/buildproject/Makefile.omdev.mingw
@@ -0,0 +1,10 @@
+# Manually created Makefile
+
+top_builddir = ../../../../../
+PROJECTDIR = ../../../../../build/share/omc/runtime/c/fmi/buildproject/
+
+default: install
+
+install:
+	mkdir -p $(PROJECTDIR)
+	cp -a configure.ac $(PROJECTDIR)/