Skip to content

Commit

Permalink
Bump MSL before my flight. Someone needs to baseline a few of the fai…
Browse files Browse the repository at this point in the history
…ling tests. I ran out of time to do so myself.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@16181 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed May 31, 2013
1 parent da91510 commit 9226f7c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions SimulationRuntime/c/Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ install: $(LIBSIMULATION) $(LIBRUNTIME) $(LIBFMIRUNTIME) simulation/libf2c/libf2
../fmi/import/fmuWrapper.h \
../fmi/import/xmlparser.h $(builddir_inc)
cp -Pp $(EXTERNALCBUILDDIR)/.libs/$(MODELICAEXTERNALC) $(builddir)/lib/omc
cp -Pp $(EXTERNALCBUILDDIR)/.libs/$(MODELICASTANDARDTABLES) $(builddir)/lib/omc
# copy java interface stuff
@$(MAKE) -C util/java_interface -f $(LIBMAKEFILE) && \
$(MAKE) -C util/java_interface -f $(LIBMAKEFILE) install || \
Expand Down
1 change: 1 addition & 0 deletions SimulationRuntime/c/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ LIBFMIRUNTIME=@LIBFMIRUNTIME@

REGEN = Makefile.in
MODELICAEXTERNALC = libModelicaExternalC*@SHREXT@*
MODELICASTANDARDTABLES = libModelicaStandardTables*@SHREXT@*
PREFIX = --prefix="@prefix@" --libdir='$${exec_prefix}/lib/omc'

EXTERNALCMAKEFILE=Makefile
Expand Down
4 changes: 3 additions & 1 deletion SimulationRuntime/c/ModelicaExternalC/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
MSLCSOURCES=../../../libraries/Modelica\ 3.2.1/Modelica/Resources/C-Sources/
lib_LTLIBRARIES = libModelicaExternalC.la
lib_LTLIBRARIES = libModelicaExternalC.la libModelicaStandardTables.la
libModelicaExternalC_la_SOURCES = $(MSLCSOURCES)/ModelicaInternal.c $(MSLCSOURCES)/ModelicaStrings.c $(MSLCSOURCES)/ModelicaStandardTables.c $(MSLCSOURCES)/ModelicaMatIO.c ModelicaTablesImpl.c tables.c
libModelicaStandardTables_la_SOURCES =
libModelicaStandardTables_la_LIBADD = libModelicaExternalC.la

0 comments on commit 9226f7c

Please sign in to comment.