Change the default to statically linked FMUs

Added a pre-built static version of the FMI SimulationRuntime to
improve performance of statically linked FMUs.

Belonging to [master]:
  - #2395
  - OpenModelica/OpenModelica-testsuite#933

Author: sjoelund

Compiler/FrontEnd/ModelicaBuiltin.mo

@@ -2456,7 +2456,7 @@ The only required argument is the className, while all others have some default
   input String version = "2.0" "FMU version, 1.0 or 2.0.";
   input String fmuType = "me" "FMU type, me (model exchange), cs (co-simulation), me_cs (both model exchange and co-simulation)";
   input String fileNamePrefix = "<default>" "fileNamePrefix. <default> = \"className\"";
-  input String platforms[:] = {"dynamic"} "The list of platforms to generate code for. \"dynamic\"=current platform, dynamically link the runtime. \"static\"=current platform, statically link everything. Else, use a host triple, e.g. \"x86_64-linux-gnu\" or \"x86_64-w64-mingw32\"";
+  input String platforms[:] = {"static"} "The list of platforms to generate code for. \"dynamic\"=current platform, dynamically link the runtime. \"static\"=current platform, statically link everything. Else, use a host triple, e.g. \"x86_64-linux-gnu\" or \"x86_64-w64-mingw32\"";
   input Boolean includeResources = false "include Modelica based resources via loadResource or not";
   output String generatedFileName "Returns the full path of the generated FMU.";
 external "builtin";

Compiler/Script/CevalScriptBackend.mo

@@ -3327,10 +3327,10 @@ algorithm
         // replace @XX@ variables in the Makefile
         makefileStr := System.stringReplace(makefileStr, "@CC@", CC);
         makefileStr := System.stringReplace(makefileStr, "@CFLAGS@", CFLAGS);
-        makefileStr := System.stringReplace(makefileStr, "@LDFLAGS@", LDFLAGS+System.getRTLibsFMU());
+        makefileStr := System.stringReplace(makefileStr, "@LDFLAGS@", LDFLAGS+" -lSimulationRuntimeFMI "+System.getRTLibsFMU());
         makefileStr := System.stringReplace(makefileStr, "@LIBS@", "");
         makefileStr := System.stringReplace(makefileStr, "@DLLEXT@", System.getDllExt());
-        makefileStr := System.stringReplace(makefileStr, "@NEED_RUNTIME@", "1");
+        makefileStr := System.stringReplace(makefileStr, "@NEED_RUNTIME@", "");
         makefileStr := System.stringReplace(makefileStr, "@NEED_DGESV@", "");
         makefileStr := System.stringReplace(makefileStr, "@FMIPLATFORM@", System.modelicaPlatform());
         makefileStr := System.stringReplace(makefileStr, "@CPPFLAGS@", "-DOMC_MINIMAL_RUNTIME=1 -DCMINPACK_NO_DLL=1");
@@ -3368,7 +3368,7 @@ protected function buildModelFMU " author: Frenkel TUD
   input String inFMUType;
   input String inFileNamePrefix;
   input Boolean addDummy "if true, add a dummy state";
-  input list<String> platforms = {"dynamic"};
+  input list<String> platforms = {"static"};
   output FCore.Cache cache;
   output Values.Value outValue;
 protected

SimulationRuntime/c/Makefile.common

@@ -8,7 +8,9 @@
 NEED_DGESV=1
 include Makefile.objs
 
+LIBSIMULATIONFMI=libSimulationRuntimeFMI.a
 OMC_MINIMAL_RUNTIME=
+BUILDPATH=build/c
 
 CPPFLAGS = -I. -I$(top_builddir)/Compiler/runtime -I$(top_builddir)/3rdParty/gc/include -I$(top_builddir)/3rdParty/FMIL/install/include/ -I$(top_builddir)/3rdParty/lis-1.4.12/include/ -I$(top_builddir)/3rdParty/Ipopt/include/ -I$(builddir_inc)/c/sundials/ $(CONFIG_CPPFLAGS) -DGC_REDIRECT_TO_LOCAL -I$(builddir_inc)/c
 override CFLAGS += $(CPPFLAGS) $(CONFIG_CFLAGS) $(EXTRA_CFLAGS)
@@ -132,7 +134,7 @@ RUNTIMEINITIALIZATION_HEADERS = \
 # ./simulation/solver/solver_main.h \
 # ./util/list.h \
 
-.PHONY : clean all emcc emcc-clean emcc/libSimulationRuntimeC.so
+.PHONY : clean all emcc emcc-clean emcc/libSimulationRuntimeC.so fmi-runtime mkbuilddir
 
 all : install
 
@@ -187,44 +189,61 @@ libOpenModelicaFMIRuntimeC.dylib: $(FMIOBJSPATH) $(GCOBJPATH_MINIMAL) Makefile.o
 	@rm -f $@
 	$(CC) -shared -o $@ $(FMIOBJSPATH) $(GCOBJPATH_MINIMAL) $(LDFLAGS_SIM) -undefined dynamic_lookup -install_name '@rpath/$@'
 
-$(GCOBJSPATH):%$(OBJ_EXT): %.c $(GCHFILESPATH) $(COMMON_HEADERS)
+MKBUILDDIR=@(mkdir -p "$(BUILDPATH)" && cd "$(BUILDPATH)" && mkdir -p $(GCPATH) $(METAPATH) $(UTILPATH) $(MATHPATH) $(SOLVERPATH) $(INITIALIZATIONPATH) $(RESULTSPATH) $(SIMPATH) $(OPTIMIZATIONPATH)/DataManagement $(OPTIMIZATIONPATH)/eval_all $(FMIPATH) $(OPTIMIZATIONPATH) linearization external_solvers)
+$(GCOBJSPATH):$(BUILDPATH)/%$(OBJ_EXT): %.c $(GCHFILESPATH) $(COMMON_HEADERS)
+	$(MKBUILDDIR)
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-$(METAOBJSPATH):%$(OBJ_EXT): %.c $(METAHFILESPATH) $(COMMON_HEADERS)
+$(METAOBJSPATH):$(BUILDPATH)/%$(OBJ_EXT): %.c $(METAHFILESPATH) $(COMMON_HEADERS)
+	$(MKBUILDDIR)
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-meta/meta_modelica_catch$(OBJ_EXT): meta/meta_modelica_catch.c
+$(BUILDPATH)/./meta/meta_modelica_catch$(OBJ_EXT): meta/meta_modelica_catch.c
+	$(MKBUILDDIR)
 	$(CC) -c $(CFLAGS) -o $@ $< -g
 
-$(UTILOBJSPATH):%$(OBJ_EXT): %.c $(UTILHFILESPATH) $(COMMON_HEADERS)
+$(UTILOBJSPATH):$(BUILDPATH)/%$(OBJ_EXT): %.c $(UTILHFILESPATH) $(COMMON_HEADERS)
+	$(MKBUILDDIR)
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-$(MATHOBJSPATH):%$(OBJ_EXT): %.c $(MATHHFILESPATH) $(COMMON_HEADERS)
+$(MATHOBJSPATH):$(BUILDPATH)/%$(OBJ_EXT): %.c $(MATHHFILESPATH) $(COMMON_HEADERS)
+	$(MKBUILDDIR)
 	$(CC) -c $(CFLAGS) $(FPMATHFORTRAN) -o $@ $<
 
-$(SOLVEROBJSPATH):%$(OBJ_EXT): %.c $(SOLVERHFILESPATH) $(RESULTSHFILESPATH) $(INITIALIZATIONHFILESPATH) $(OPTIMIZATIONHFILESPATH) $(COMMON_HEADERS)
+$(SOLVEROBJSPATH):$(BUILDPATH)/%$(OBJ_EXT): %.c $(SOLVERHFILESPATH) $(RESULTSHFILESPATH) $(INITIALIZATIONHFILESPATH) $(OPTIMIZATIONHFILESPATH) $(COMMON_HEADERS)
+	$(MKBUILDDIR)
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-$(INITIALIZATIONOBJSPATH):%$(OBJ_EXT): %.c $(SOLVERHFILESPATH) $(INITIALIZATIONHFILESPATH) $(COMMON_HEADERS)
+$(INITIALIZATIONOBJSPATH):$(BUILDPATH)/%$(OBJ_EXT): %.c $(SOLVERHFILESPATH) $(INITIALIZATIONHFILESPATH) $(COMMON_HEADERS)
+	$(MKBUILDDIR)
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-$(RESULTSOBJSPATH):%$(OBJ_EXT): %.cpp $(RESULTSFILESPATH) $(COMMON_HEADERS)
+$(RESULTSOBJSPATH):$(BUILDPATH)/%$(OBJ_EXT): %.cpp $(RESULTSFILESPATH) $(COMMON_HEADERS)
+	$(MKBUILDDIR)
 	$(CXX) -c $(CXXFLAGS) -o $@ $<
 
-$(SIMOBJSPATH):%$(OBJ_EXT): %.cpp linearization/linearize.cpp $(SIMHFILESPATH) $(COMMON_HEADERS)
+$(SIMOBJSPATH):$(BUILDPATH)/%$(OBJ_EXT): %.cpp linearization/linearize.cpp $(SIMHFILESPATH) $(COMMON_HEADERS)
+	$(MKBUILDDIR)
 	$(CXX) -c -Ilinearization/ $(CXXFLAGS) -o $@ $<
 
-$(SIMOBJSPATHC):%$(OBJ_EXT): %.c $(SIMHFILESPATH) $(COMMON_HEADERS)
+$(SIMOBJSPATHC):$(BUILDPATH)/%$(OBJ_EXT): %.c $(SIMHFILESPATH) $(COMMON_HEADERS)
 	@echo Deps: $(SIMHFILESPATH) $(COMMON_HEADERS)
+	$(MKBUILDDIR)
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-$(OPTIMIZATIONOBJSPATH):%$(OBJ_EXT): %.c $(OPTIMIZATIONHFILESPATH) $(COMMON_HEADERS)
+$(OPTIMIZATIONOBJSPATH):$(BUILDPATH)/%$(OBJ_EXT): %.c $(OPTIMIZATIONHFILESPATH) $(COMMON_HEADERS)
+	$(MKBUILDDIR)
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-$(FMIOBJSPATH):%$(OBJ_EXT): %.c $(COMMON_HEADERS)
+$(FMIOBJSPATH):$(BUILDPATH)/%$(OBJ_EXT): %.c $(COMMON_HEADERS)
+	$(MKBUILDDIR)
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-util/socket$(OBJ_EXT): util/socket_win.cpp util/socket_unix.cpp
+$(EXTERNAL_SOLVER_OBJSPATH):$(BUILDPATH)/%$(OBJ_EXT): $(builddir_inc)/c/%.c
+	$(MKBUILDDIR)
+	$(CC) -c $(CFLAGS) -o $@ $<
+
+$(BUILDPATH)/util/socket$(OBJ_EXT): util/socket_win.cpp util/socket_unix.cpp
 
 bootstrap-dependencies: $(LIBRUNTIME)
 	cp -p $(LIBRUNTIME) $(builddir_lib)
@@ -240,9 +259,17 @@ bootstrap-dependencies: $(LIBRUNTIME)
 	cp -p $(RUNTIMEMETAGC_HEADERS) $(builddir_inc)/c/gc/
 	cp -p $(RUNTIMEUTIL_HEADERS) $(builddir_inc)/c/util/
 
-install: bootstrap-dependencies $(LIBSIMULATION) $(LIBFMIRUNTIME) $(ALL_OBJS) sourcedist
+fmi-runtime: sourcedist
+	$(MAKE) "$(LIBSIMULATIONFMI)" OMC_MINIMAL_RUNTIME=1 OMC_FMI_RUNTIME=1 BUILDPATH=build/fmi OMC_NUM_NONLINEAR_SYSTEMS=1 OMC_NUM_LINEAR_SYSTEMS=1 OMC_NUM_MIXED_SYSTEMS=1
+libSimulationRuntimeFMI.a: $(FMI_ME_OBJS_BUILDPATH)
+	@# You have to remove the old archive first or it may contain old objects
+	@rm -f $@
+	$(AR) $@ $(FMI_ME_OBJS_BUILDPATH)
+	ranlib $@
+
+install: bootstrap-dependencies $(LIBSIMULATION) $(LIBFMIRUNTIME) $(ALL_OBJS) fmi-runtime
 	# copy libraries
-	cp -p $(LIBSIMULATION) $(LIBFMIRUNTIME) $(builddir_lib)
+	cp -p $(LIBSIMULATION) $(LIBFMIRUNTIME) $(LIBSIMULATIONFMI) $(builddir_lib)
 	test ! -f libSimulationRuntimeC.bc || cp libSimulationRuntimeC.bc $(builddir_lib)/emcc/libSimulationRuntimeC.so
 	test ! `uname` = Darwin || install_name_tool -change libsundials_idas.0.dylib @rpath/libsundials_idas.0.dylib $(builddir_lib)/$(LIBFMIRUNTIME)
 	test ! `uname` = Darwin || install_name_tool -change libsundials_ida.2.dylib @rpath/libsundials_ida.2.dylib $(builddir_lib)/$(LIBFMIRUNTIME)
@@ -259,7 +286,7 @@ install: bootstrap-dependencies $(LIBSIMULATION) $(LIBFMIRUNTIME) $(ALL_OBJS) so
 	   ../fmi/export/fmi2/fmu2_model_interface.c $(builddir_inc)/c/fmi2
 
 clean:
-	rm -f $(ALL_PATHS_CLEAN_OBJS) fmi/*.o *.a *.so optimization/*/*.o
+	rm -rf $(ALL_PATHS_CLEAN_OBJS) fmi/*.o *.a *.so optimization/*/*.o build/
 	(! test -f $(EXTERNALCBUILDDIR)/Makefile) || make -C $(EXTERNALCBUILDDIR) clean
 	(! test -f $(EXTERNALCBUILDDIR)/Makefile) || make -C $(EXTERNALCBUILDDIR) distclean
 
@@ -269,21 +296,23 @@ sourcedist1:
 sourcedist2:
 	$(MAKE) -C ../fmi/export/buildproject -f $(defaultMakefileTarget)
 
+# Copied files need to preserve the time-stamp or the external solvers builds
+# over and over again
 sourcedist_internal:
 	mkdir -p $(builddir_inc)/c/external_solvers external_solvers
-	cp \
+	cp -p \
 	 $(CMINPACK_OBJS:%=$(CMINPACKDIR)/%.c) \
 	 $(LAPACK_OBJS:%=$(LAPACKDIR)/lapack/%.c) \
 	 $(BLAS_OBJS:%=$(LAPACKDIR)/blas/%.c) \
 	 $(LIBF2C_OBJS:%=$(LAPACKDIR)/libf2c/%.c) \
 	 "./external_solvers/"
-	cp \
+	cp -p \
 	 "$(CMINPACKDIR)/minpack.h" "$(CMINPACKDIR)/cminpack.h" \
 	 "$(LAPACKDIR)/include/blaswrap.h" \
 	 "$(LAPACKDIR)/include/clapack.h" \
 	 "$(LAPACKDIR)/include/f2c.h" \
 	 "$(builddir_inc)/c/external_solvers"
-	cd $(builddir_inc)/c/ && mkdir -p $(ALL_PATHS)
-	(D=`pwd` && cd $(builddir_inc)/c/ $(FMI_ME_OBJS:%.o= && (OMCFILE=% && cp $$D/$$OMCFILE.c $$OMCFILE.c)))
+	@cd $(builddir_inc)/c/ && mkdir -p $(ALL_PATHS)
+	@(D=`pwd` && cd $(builddir_inc)/c/ $(FMI_ME_OBJS:%.o= && (OMCFILE=% && cp -p $$D/$$OMCFILE.c $$OMCFILE.c)))
 	cp Makefile.objs $(builddir_inc)/c/
 	rm -r ./external_solvers

SimulationRuntime/c/Makefile.objs

@@ -104,53 +104,53 @@ SIM_HFILES = options.h simulation_input_xml.h simulation_info_json.h modelinfo.h
 
 FMIPATH = ./fmi/
 FMI_OBJS = FMICommon$(OBJ_EXT) FMI1Common$(OBJ_EXT) FMI1ModelExchange$(OBJ_EXT) FMI1CoSimulation$(OBJ_EXT) FMI2Common$(OBJ_EXT) FMI2ModelExchange$(OBJ_EXT)
-FMIOBJSPATH = $(FMI_OBJS:%=$(FMIPATH)%)
+FMIOBJSPATH = $(FMI_OBJS:%=$(BUILDPATH)/$(FMIPATH)%)
 
 GCPATH = ./gc/
-GCOBJSPATH = $(GC_OBJS:%=$(GCPATH)%)
+GCOBJSPATH = $(GC_OBJS:%=$(BUILDPATH)/$(GCPATH)%)
 GCHFILESPATH = $(GC_HFILES:%=$(GCPATH)%)
 GCHFILESPATH_MINIMAL = $(GC_HFILES_MINIMAL:%=$(GCPATH)%)
 GCOBJSPATH_MINIMAL = $(GC_OBJS_MINIMAL:%=$(GCPATH)%)
 
 
 METAPATH = ./meta/
-METAOBJSPATH = $(META_OBJS:%=$(METAPATH)%)
+METAOBJSPATH = $(META_OBJS:%=$(BUILDPATH)/$(METAPATH)%)
 METAHFILESPATH = $(META_HFILES:%=$(METAPATH)%)
 
 UTILPATH = ./util/
-UTILOBJSPATH = $(UTIL_OBJS:%=$(UTILPATH)%)
+UTILOBJSPATH = $(UTIL_OBJS:%=$(BUILDPATH)/$(UTILPATH)%)
 UTILHFILESPATH = $(UTIL_HFILES:%=$(UTILPATH)%)
 
 MATHPATH = ./math-support/
-MATHOBJSPATH = $(MATH_OBJS:%=$(MATHPATH)%)
+MATHOBJSPATH = $(MATH_OBJS:%=$(BUILDPATH)/$(MATHPATH)%)
 MATHHFILESPATH = $(MATH_HFILES:%=$(MATHPATH)%)
 
 INITIALIZATIONPATH = ./simulation/solver/initialization/
-INITIALIZATIONOBJSPATH = $(INITIALIZATION_OBJS:%=$(INITIALIZATIONPATH)%)
+INITIALIZATIONOBJSPATH = $(INITIALIZATION_OBJS:%=$(BUILDPATH)/$(INITIALIZATIONPATH)%)
 INITIALIZATIONHFILESPATH = $(INITIALIZATION_HFILES:%=$(INITIALIZATIONPATH)%)
 
 OPTIMIZATIONPATH = ./optimization/
-OPTIMIZATIONOBJSPATH = $(OPTIMIZATION_OBJS:%=$(OPTIMIZATIONPATH)%)
+OPTIMIZATIONOBJSPATH = $(OPTIMIZATION_OBJS:%=$(BUILDPATH)/$(OPTIMIZATIONPATH)%)
 OPTIMIZATIONHFILESPATH = $(OPTIMIZATION_HFILES:%=$(OPTIMIZATIONPATH)%)
 
 SOLVERPATH = ./simulation/solver/
-SOLVEROBJSPATH = $(SOLVER_OBJS:%=$(SOLVERPATH)%)
+SOLVEROBJSPATH = $(SOLVER_OBJS:%=$(BUILDPATH)/$(SOLVERPATH)%)
 SOLVERHFILESPATH = $(SOLVER_HFILES:%=$(SOLVERPATH)%)
 
 RESULTSPATH = ./simulation/results/
-RESULTSOBJSPATH = $(RESULTS_OBJS:%=$(RESULTSPATH)%)
+RESULTSOBJSPATH = $(RESULTS_OBJS:%=$(BUILDPATH)/$(RESULTSPATH)%)
 RESULTSHFILESPATH = $(RESULTS_HFILES:%=$(RESULTSPATH)%)
 RESULTSFILESPATH = $(RESULTS_FILES:%=$(RESULTSPATH)%)
 
 SIMPATH = ./simulation/
-SIMOBJSPATH = $(SIM_OBJS:%=$(SIMPATH)%)
-SIMOBJSPATHC = $(SIM_OBJS_C:%=$(SIMPATH)%)
+SIMOBJSPATH = $(SIM_OBJS:%=$(BUILDPATH)/$(SIMPATH)%)
+SIMOBJSPATHC = $(SIM_OBJS_C:%=$(BUILDPATH)/$(SIMPATH)%)
 SIMHFILESPATH = $(SIM_HFILES:%=$(SIMPATH)%)
 
 FMIPATH = ./fmi/
-FMIOBJSPATH = $(FMI_OBJS:%=$(FMIPATH)%)
+FMIOBJSPATH = $(FMI_OBJS:%=$(BUILDPATH)/$(FMIPATH)%)
 
-ALL_OBJS = $(GCOBJSPATH) $(METAOBJSPATH) $(UTILOBJSPATH) $(MATHOBJSPATH) $(SOLVEROBJSPATH) $(INITIALIZATIONOBJSPATH) $(OPTIMIZATIONOBJSPATH) $(RESULTSOBJSPATH) $(SIMOBJSPATH) $(SIMOBJSPATHC) meta/meta_modelica_catch$(OBJ_EXT)
+ALL_OBJS = $(GCOBJSPATH) $(METAOBJSPATH) $(UTILOBJSPATH) $(MATHOBJSPATH) $(SOLVEROBJSPATH) $(INITIALIZATIONOBJSPATH) $(OPTIMIZATIONOBJSPATH) $(RESULTSOBJSPATH) $(SIMOBJSPATH) $(SIMOBJSPATHC) $(BUILDPATH)/./meta/meta_modelica_catch$(OBJ_EXT)
 
 # External solvers needed by FMI for ME
 ifeq ($(OMC_NUM_NONLINEAR_SYSTEMS),0)
@@ -167,18 +167,27 @@ LIBF2C_OBJS = i_nint pow_di s_cmp s_copy
 endif
 endif
 
+ifeq ($(OMC_FMI_RUNTIME),)
+else
+EXTERNAL_SOLVER_OBJSPATH1=$(CMINPACK_OBJS:%=./external_solvers/%$(OBJ_EXT)) \
+  $(LAPACK_OBJS:%=./external_solvers/%$(OBJ_EXT)) \
+  $(BLAS_OBJS:%=./external_solvers/%$(OBJ_EXT)) \
+  $(LIBF2C_OBJS:%=./external_solvers/%$(OBJ_EXT))
+EXTERNAL_SOLVER_OBJSPATH=$(EXTERNAL_SOLVER_OBJSPATH1:./%=$(BUILDPATH)/%)
+endif
 # Only objects needed for FMI for Modelica Exchange
-FMI_ME_OBJS = $(GCOBJSPATH_MINIMAL) $(UTILOBJSPATH) $(MATHOBJSPATH) $(SIMOBJSPATHC) $(SOLVEROBJSPATH) $(INITIALIZATIONOBJSPATH) \
+FMI_ME_OBJS = $(GCOBJSPATH_MINIMAL:$(BUILDPATH)/%=%) $(UTILOBJSPATH:$(BUILDPATH)/%=%) $(MATHOBJSPATH:$(BUILDPATH)/%=%) $(SIMOBJSPATHC:$(BUILDPATH)/%=%) $(SOLVEROBJSPATH:$(BUILDPATH)/%=%) $(INITIALIZATIONOBJSPATH:$(BUILDPATH)/%=%) \
   ./meta/meta_modelica_catch$(OBJ_EXT) \
   $(CMINPACK_OBJS:%=./external_solvers/%$(OBJ_EXT)) \
   $(LAPACK_OBJS:%=./external_solvers/%$(OBJ_EXT)) \
   $(BLAS_OBJS:%=./external_solvers/%$(OBJ_EXT)) \
   $(LIBF2C_OBJS:%=./external_solvers/%$(OBJ_EXT))
+FMI_ME_OBJS_BUILDPATH = $(FMI_ME_OBJS:./external_solvers/%=$(BUILDPATH)/external_solvers/%)
 
 ALL_HEADERS = $(METAHFILESPATH) $(GCFILESPATH) $(UTILHFILESPATH) $(MATHHFILESPATH) $(SOLVERHFILESPATH) $(INITIALIZATIONHFILESPATH) $(OPTIMIZATIONHFILESPATH) $(RESULTSHFILESPATH) $(SIMHFILESPATH)
 ALL_PATHS = $(METAPATH) $(FMIPATH) $(GCPATH) $(UTILPATH) $(MATHPATH) $(SOLVERPATH) $(INITIALIZATIONPATH) $(OPTIMIZATIONPATH) $(RESULTSPATH) $(SIMPATH) linearization/
 ALL_PATHS_CLEAN_OBJS = $(ALL_PATHS:%=%*$(OBJ_EXT)) $(ALL_PATHS:%=%*.a) meta/gc/*$(OBJ_EXT)
 
-BASE_OBJS = $(GCOBJSPATH) $(METAOBJSPATH) $(UTILOBJSPATH) meta/meta_modelica_catch$(OBJ_EXT)
+BASE_OBJS = $(GCOBJSPATH) $(METAOBJSPATH) $(UTILOBJSPATH) ./meta/meta_modelica_catch$(OBJ_EXT)
 
 COMMON_HEADERS = util/omc_msvc.h openmodelica.h openmodelica_types.h ModelicaUtilities.h omc_inline.h openmodelica_func.h simulation_data.h