From 36cabeec863093eec197c44ce963cb6017429356 Mon Sep 17 00:00:00 2001 From: adrpo Date: Wed, 11 Nov 2015 04:15:23 +0100 Subject: [PATCH] - fix Windows build, for now C FMUs are broken --- SimulationRuntime/c/Makefile.common | 2 +- SimulationRuntime/c/Makefile.in | 2 ++ SimulationRuntime/c/Makefile.omdev.mingw | 5 ++++- .../fmi/export/buildproject/Makefile.omdev.mingw | 10 ++++++++++ 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 SimulationRuntime/fmi/export/buildproject/Makefile.omdev.mingw diff --git a/SimulationRuntime/c/Makefile.common b/SimulationRuntime/c/Makefile.common index 0a237a472d3..c259b901c74 100644 --- 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 index 7de6f1b3513..e6bc39f90bb 100644 --- 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 index 8d7aba3d06f..b4f1619bebe 100644 --- 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 new file mode 100644 index 00000000000..716678c4fe7 --- /dev/null +++ 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)/