Skip to content

Commit 9c5ae60

Browse files
sjoelundsjoelund
committed
Remove f2c and a bit more from the simulation runtime (thanks to r24305)
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@24325 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent 2c49ede commit 9c5ae60

File tree

5 files changed

+43
-64
lines changed

5 files changed

+43
-64
lines changed

‎Examples/BuildModelRecursive.mos‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,15 @@ end if;
170170
// outputFormat can be overridden in CustomCommands.mos, so we set it to 'default' first
171171
outputFormat := if outputFormat == \"default\" then (if referenceExists then \"mat\" else \"empty\") else outputFormat;
172172

173-
if referenceExists then
173+
compareVarsUri := \"modelica://\" + /*libraryString*/ \"Buildings\" + \"/Resources/Scripts/OpenModelica/compareVars/" + s + ".mos\";
174+
(compareVarsFile,compareVarsFileMessages) := uriToFilename(compareVarsUri);
175+
176+
if regularFileExists(compareVarsFile) then
177+
runScript(compareVarsFile);
178+
vars := compareVars;
179+
variableFilter := sum(stringReplace(stringReplace(s,\"[\",\".\"),\"]\",\".\") + \"|\" for s in vars) + \"time\";
180+
numCompared := size(vars,1);
181+
elseif referenceExists then
174182
vars := readSimulationResultVars(reference,readParameters=false);
175183
variableFilter := sum(stringReplace(stringReplace(s,\"[\",\".\"),\"]\",\".\") + \"|\" for s in vars);
176184
numCompared := size(vars,1);
@@ -256,6 +264,11 @@ end if;
256264

257265
system(\"sed -i '300,$ d' '\" + simFile + \"'\"); // Only keep the top 300 lines
258266
timeSim := OpenModelica.Scripting.Internal.Time.timerTock(OpenModelica.Scripting.Internal.Time.RT_CLOCK_USER_RESERVED);
267+
268+
if (not simRes) and regularFileExists(resFile) then
269+
system(\"mv '\" + resFile + \"' '\" + resFile + \".failed\");
270+
end if;
271+
259272
if simRes then
260273
system(\"touch "+s+".simsuccess\");
261274
prefix := \"files/"+s+".diff\";

‎SimulationRuntime/c/CMakeLists.txt‎

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ ENDIF(SUNDIALS_INCLUDE_DIR)
6767

6868
# Defines for Visual Studio
6969
if(MSVC)
70-
add_definitions(-D_CRT_SECURE_NO_WARNINGS -DNOMINMAX -D_COMPLEX_DEFINED)
70+
add_definitions(-D_CRT_SECURE_NO_WARNINGS -DNOMINMAX -D_COMPLEX_DEFINED)
7171
# GC shall not use a dll
7272
add_definitions(-DGC_NOT_DLL)
7373
endif(MSVC)
@@ -82,7 +82,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/meta)
8282
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/meta/gc)
8383
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/simulation)
8484
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/optimization)
85-
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/simulation/libf2c)
8685
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/simulation/results)
8786
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/simulation/solver)
8887
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/simulation/solver/initialization)
@@ -130,7 +129,6 @@ MACRO(BUILDMODEL model mo dir Flags CSRC)
130129
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/meta)
131130
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/meta/gc)
132131
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation)
133-
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/libf2c)
134132
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/results)
135133
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/solver)
136134
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/solver/initialization)
@@ -151,8 +149,8 @@ MACRO(BUILDMODEL model mo dir Flags CSRC)
151149
${CMAKE_CURRENT_BINARY_DIR}/${model}_init.txt)
152150
SET(OMC_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${model}.c
153151
# ${CMAKE_CURRENT_BINARY_DIR}/${model}_functions.cpp
154-
${CMAKE_CURRENT_BINARY_DIR}/${model}_functions.h
155-
${CMAKE_CURRENT_BINARY_DIR}/${model}_records.c)
152+
${CMAKE_CURRENT_BINARY_DIR}/${model}_functions.h
153+
${CMAKE_CURRENT_BINARY_DIR}/${model}_records.c)
156154

157155
# custom command fuer openmodelicacompiler
158156
ADD_CUSTOM_COMMAND(OUTPUT ${OMC_OUTPUT}
@@ -164,7 +162,7 @@ MACRO(BUILDMODEL model mo dir Flags CSRC)
164162
ADD_CUSTOM_TARGET(${model}codegen ALL DEPENDS ${OMC_OUTPUT})
165163

166164
ADD_EXECUTABLE(${model} ${OMC_OUTPUT} ${CSRC})
167-
TARGET_LINK_LIBRARIES(${model} simulation util math-support results solver f2c meta ModelicaExternalC libexpat initialization lapack_win32_MT)
165+
TARGET_LINK_LIBRARIES(${model} simulation util math-support results solver meta ModelicaExternalC libexpat initialization lapack_win32_MT)
168166

169167
# Dependencies
170168
ADD_DEPENDENCIES(${model} ${model}codegen)
@@ -208,7 +206,6 @@ ENDIF(SUNDIALS_INCLUDE_DIR AND
208206
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/meta/gc)
209207
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/ModelicaExternalC)
210208
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation)
211-
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/libf2c)
212209
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/results)
213210
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/solver)
214211
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/solver/initialization)
@@ -273,8 +270,8 @@ ENDIF(SUNDIALS_INCLUDE_DIR AND
273270
${dir}/${model}_init.txt)
274271
SET(OMC_OUTPUT ${dir}/${model}.c
275272
# ${dir}/${model}_functions.cpp
276-
${dir}/${model}_functions.h
277-
${dir}/${model}_records.c)
273+
${dir}/${model}_functions.h
274+
${dir}/${model}_records.c)
278275
# custom command fuer openmodelicacompiler
279276
ADD_CUSTOM_COMMAND(OUTPUT ${OMC_OUTPUT}
280277
COMMAND ${OMC_DEBUG} ${Flags} ${mos}
@@ -288,7 +285,7 @@ ENDIF(SUNDIALS_INCLUDE_DIR AND
288285
ADD_DEFINITIONS(/TP)
289286
set_source_files_properties(${OMC_OUTPUT} PROPERTIES LANGUAGE CXX)
290287
ADD_EXECUTABLE(${model} ${OMC_OUTPUT} ${CSRC})
291-
TARGET_LINK_LIBRARIES(${model} simulation util math-support results solver meta f2c ModelicaExternalC libexpat initialization lapack_win32_MT ${SUNDIALS_LIBRARIES})
288+
TARGET_LINK_LIBRARIES(${model} simulation util math-support results solver meta ModelicaExternalC libexpat initialization lapack_win32_MT ${SUNDIALS_LIBRARIES})
292289

293290
# custom command to copy xml file
294291
SET(XML_CODE ${dir}/${model}_init.xml)
@@ -341,7 +338,6 @@ ENDIF(SUNDIALS_INCLUDE_DIR AND
341338
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/meta/gc)
342339
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/ModelicaExternalC)
343340
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation)
344-
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/libf2c)
345341
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/results)
346342
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/solver)
347343
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/solver/initialization)
@@ -370,8 +366,8 @@ ENDIF(SUNDIALS_INCLUDE_DIR AND
370366
SET(OMC_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${model}.c
371367
${CMAKE_CURRENT_BINARY_DIR}/${model}_FMU.c
372368
# ${CMAKE_CURRENT_BINARY_DIR}/${model}_functions.cpp
373-
${CMAKE_CURRENT_BINARY_DIR}/${model}_functions.h
374-
${CMAKE_CURRENT_BINARY_DIR}/${model}_records.c)
369+
${CMAKE_CURRENT_BINARY_DIR}/${model}_functions.h
370+
${CMAKE_CURRENT_BINARY_DIR}/${model}_records.c)
375371
# custom command fuer openmodelicacompiler
376372
ADD_CUSTOM_COMMAND(OUTPUT ${OMC_OUTPUT}
377373
COMMAND ${OMC_DEBUG} ${Flags} ${dir}/${model}_FMU.mos
@@ -382,10 +378,10 @@ ENDIF(SUNDIALS_INCLUDE_DIR AND
382378

383379
SET(OMC_FMU_CODE ${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmu1_model_interface.h
384380
${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmiModelFunctions.h
385-
${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmiModelTypes.h)
381+
${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmiModelTypes.h)
386382

387383
ADD_LIBRARY(${model} SHARED ${OMC_OUTPUT} ${CSRC} ${OMC_FMU_CODE})
388-
TARGET_LINK_LIBRARIES(${model} simulation util math-support results solver f2c meta ModelicaExternalC libexpat initialization lapack_win32_MT)
384+
TARGET_LINK_LIBRARIES(${model} simulation util math-support results solver meta ModelicaExternalC libexpat initialization lapack_win32_MT)
389385

390386
# Dependencies
391387
ADD_DEPENDENCIES(${model} ${model}codegen)
@@ -429,7 +425,6 @@ ENDIF(SUNDIALS_INCLUDE_DIR AND
429425
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/meta/gc)
430426
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/ModelicaExternalC)
431427
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation)
432-
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/libf2c)
433428
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/results)
434429
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/solver)
435430
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/solver/initialization)
@@ -455,8 +450,8 @@ ENDIF(SUNDIALS_INCLUDE_DIR AND
455450
SET(OMC_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FMU_MODELNAME}.c
456451
${CMAKE_CURRENT_BINARY_DIR}/${FMU_MODELNAME}_FMU.c
457452
# ${CMAKE_CURRENT_BINARY_DIR}/${FMU_MODELNAME}_functions.cpp
458-
${CMAKE_CURRENT_BINARY_DIR}/${FMU_MODELNAME}_functions.h
459-
${CMAKE_CURRENT_BINARY_DIR}/${FMU_MODELNAME}_records.c)
453+
${CMAKE_CURRENT_BINARY_DIR}/${FMU_MODELNAME}_functions.h
454+
${CMAKE_CURRENT_BINARY_DIR}/${FMU_MODELNAME}_records.c)
460455
# custom command fuer openmodelicacompiler
461456
ADD_CUSTOM_COMMAND(OUTPUT ${OMC_OUTPUT}
462457
COMMAND ${OMC_DEBUG} ${Flags} ${mos}
@@ -467,12 +462,12 @@ ENDIF(SUNDIALS_INCLUDE_DIR AND
467462

468463
SET(OMC_FMU_CODE ${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmu1_model_interface.h
469464
${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmiModelFunctions.h
470-
${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmiModelTypes.h)
465+
${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmiModelTypes.h)
471466

472467
ADD_DEFINITIONS(/TP ${FMU_MODELNAME}.c)
473468
set_source_files_properties(${OMC_OUTPUT} PROPERTIES LANGUAGE CXX)
474469
ADD_LIBRARY(${model} SHARED ${OMC_OUTPUT} ${CSRC} ${OMC_FMU_CODE})
475-
TARGET_LINK_LIBRARIES(${model} simulation util math-support results solver meta f2c ModelicaExternalC libexpat initialization lapack_win32_MT ${SUNDIALS_LIBRARIES})
470+
TARGET_LINK_LIBRARIES(${model} simulation util math-support results solver meta ModelicaExternalC libexpat initialization lapack_win32_MT ${SUNDIALS_LIBRARIES})
476471

477472
# Dependencies
478473
ADD_DEPENDENCIES(${model} ${model}codegen)

‎SimulationRuntime/c/Makefile.common‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ include Makefile.objs
88

99
OMC_MINIMAL_RUNTIME=
1010

11-
CPPFLAGS = -I. -I$(UTILPATH) -I. -I$(METAPATH) -I$(METAPATH)gc $(LIBF2CINC) -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-3.11.6/include/ $(CONFIG_CPPFLAGS) -DGC_REDIRECT_TO_LOCAL
11+
CPPFLAGS = -I. -I$(UTILPATH) -I. -I$(METAPATH) -I$(METAPATH)gc -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-3.11.6/include/ $(CONFIG_CPPFLAGS) -DGC_REDIRECT_TO_LOCAL
1212
override CFLAGS += $(CPPFLAGS) $(CONFIG_CFLAGS) $(EXTRA_CFLAGS)
1313

1414
ifeq ($(OMC_MINIMAL_RUNTIME),)
15-
OPTIONAL_LIBS=$(LIBF2C_BUILD) $(CDASKRDIR)/libcdaskr.a
15+
OPTIONAL_LIBS=$(CDASKRDIR)/libcdaskr.a
1616
else
1717
override CFLAGS += -DOMC_MINIMAL_RUNTIME
1818
endif
@@ -24,7 +24,7 @@ builddir = ../../build
2424

2525
CDASKRDIR=$(top_builddir)/3rdParty/Cdaskr/solver/
2626

27-
RUNTIME_HEADERS = $(LIBF2CHEADER) \
27+
RUNTIME_HEADERS = \
2828
./omc_inline.h \
2929
./math-support/blaswrap.h \
3030
./openmodelica_func.h \
@@ -100,7 +100,7 @@ RUNTIMEINITIALIZATION_HEADERS = \
100100
# ./simulation/solver/solver_main.h \
101101
# ./util/list.h \
102102

103-
.PHONY : clean all $(LIBF2C) emcc emcc-clean emcc/libSimulationRuntimeC.so emcc/libf2c.so
103+
.PHONY : clean all emcc emcc-clean emcc/libSimulationRuntimeC.so
104104

105105
all : install
106106

@@ -147,11 +147,11 @@ libOpenModelicaFMIRuntimeC.a: $(FMIOBJSPATH) Makefile.objs
147147
$(AR) $@ $(FMILIB) $(FMIOBJSPATH)
148148
ranlib $@
149149

150-
libOpenModelicaFMIRuntimeC.so: $(FMIOBJSPATH) $(LIBF2C_BUILD) Makefile.objs
150+
libOpenModelicaFMIRuntimeC.so: $(FMIOBJSPATH) Makefile.objs
151151
@rm -f $@
152152
$(CC) -shared -o $@ $(FMIOBJSPATH) $(LDFLAGS)
153153

154-
libOpenModelicaFMIRuntimeC.dylib: $(FMIOBJSPATH) $(LIBF2C_BUILD) Makefile.objs
154+
libOpenModelicaFMIRuntimeC.dylib: $(FMIOBJSPATH) Makefile.objs
155155
@rm -f $@
156156
$(CC) -shared -o $@ $(FMIOBJSPATH) $(LDFLAGS_SIM) -undefined dynamic_lookup -install_name '@rpath/$@'
157157

@@ -191,17 +191,10 @@ $(FMIOBJSPATH):%$(OBJ_EXT): %.c $(COMMON_HEADERS)
191191

192192
util/socket$(OBJ_EXT): util/socket_win.cpp util/socket_unix.cpp
193193

194-
simulation/libf2c/libf2c.a:
195-
$(MAKE) -C simulation/libf2c -f ${LIBMAKEFILE}
196-
197-
$(builddir_lib)/libf2c.a: simulation/libf2c/libf2c.a
198-
cp $< $@
199-
200-
install: $(LIBSIMULATION) $(LIBRUNTIME) $(LIBFMIRUNTIME) $(ALL_OBJS) $(LIBF2C_BUILD)
194+
install: $(LIBSIMULATION) $(LIBRUNTIME) $(LIBFMIRUNTIME) $(ALL_OBJS)
201195
# copy libraries
202196
cp -p $(LIBSIMULATION) $(LIBRUNTIME) $(LIBFMIRUNTIME) $(builddir_lib)
203197
test ! -f libSimulationRuntimeC.bc || cp libSimulationRuntimeC.bc $(builddir_lib)/emcc/libSimulationRuntimeC.so
204-
test ! -f simulation/libf2c/libf2c.bc || cp simulation/libf2c/libf2c.bc $(builddir_lib)/emcc/libf2c.so
205198
# copy header files
206199
cp -p $(RUNTIME_HEADERS) $(builddir_inc)/c/
207200
cp -p $(RUNTIMELINEAR_HEADERS) $(builddir_inc)/c/linearization/
@@ -225,6 +218,5 @@ install: $(LIBSIMULATION) $(LIBRUNTIME) $(LIBFMIRUNTIME) $(ALL_OBJS) $(LIBF2C_BU
225218

226219
clean:
227220
rm -f $(ALL_PATHS_CLEAN_OBJS) fmi/*.o *.a *.so optimization/*/*.o
228-
$(MAKE) -C simulation/libf2c -f ${LIBMAKEFILE} clean
229221
(! test -f $(EXTERNALCBUILDDIR)/Makefile) || make -C $(EXTERNALCBUILDDIR) clean
230222
(! test -f $(EXTERNALCBUILDDIR)/Makefile) || make -C $(EXTERNALCBUILDDIR) distclean

‎SimulationRuntime/c/Makefile.in‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,6 @@ endif
3232
LIBMAKEFILE = Makefile
3333
QMAKE=@QMAKE@
3434
CONFIG_H=$(top_builddir)/Compiler/runtime/config.h $(top_builddir)/Compiler/runtime/config.unix.h
35-
# Use f2c from the OS itself... If so, don't include the f2c headers from OpenModelica
36-
#ifeq ($(LIBF2C),)
37-
#LIBF2C=@LIBF2C@
38-
#LIBF2CBUILD=
39-
ifeq ($(OMC_MINIMAL_RUNTIME),)
40-
LIBF2C=@LIBF2C@
41-
LIBF2CINC=-I./simulation/libf2c/
42-
LIBF2CHEADER=./simulation/libf2c/f2c.h
43-
LIBF2C_BUILD=$(builddir_lib)/libf2c.a
44-
endif
4535
LIBSIMULATION=@LIBSIMULATION@
4636
LIBRUNTIME=@LIBRUNTIME@
4737
LIBFMIRUNTIME=@LIBFMIRUNTIME@
@@ -60,20 +50,17 @@ Makefile: Makefile.in
6050

6151
expat.h:
6252
cp /usr/include/expat*.h .
63-
emcc: Makefile emcc/pre.js emcc/liblapack.so emcc/libblas.so emcc/libexpat.so emcc/libSimulationRuntimeC.so emcc/libf2c.so emcc/mdpad/mdpad.html
53+
emcc: Makefile emcc/pre.js emcc/liblapack.so emcc/libblas.so emcc/libexpat.so emcc/libSimulationRuntimeC.so emcc/mdpad/mdpad.html
6454
cp -a emcc/pre.js emcc/*.so emcc/mdpad $(builddir_lib)/emcc/
65-
@# emcc -Os --llvm-lto 2 -o $(builddir_lib)/emcc/libSimulationRuntimeC.js -s SIDE_MODULE=1 -s ASM_JS=1 -s TOTAL_MEMORY=536870912 -s OUTLINING_LIMIT=20000 libSimulationRuntimeC.bc simulation/libf2c/libf2c.bc emcc/liblapack.so emcc/libblas.so emcc/libexpat.so
55+
@# emcc -Os --llvm-lto 2 -o $(builddir_lib)/emcc/libSimulationRuntimeC.js -s SIDE_MODULE=1 -s ASM_JS=1 -s TOTAL_MEMORY=536870912 -s OUTLINING_LIMIT=20000 libSimulationRuntimeC.bc emcc/liblapack.so emcc/libblas.so emcc/libexpat.so
6656
emcc/liblapack.so:
6757
wget -O $@ https://github.com/tshort/openmodelica-javascript/blob/master/liblapack.so?raw=true || (rm -f $@ ; false)
6858
emcc/libblas.so:
6959
wget -O $@ https://github.com/tshort/openmodelica-javascript/blob/master/libblas.so?raw=true || (rm -f $@ ; false)
7060
emcc/libexpat.so:
7161
wget -O $@ https://github.com/tshort/openmodelica-javascript/blob/master/libexpat.so?raw=true || (rm -f $@ ; false)
72-
emcc/libf2c.so:
73-
emmake $(MAKE) -C simulation/libf2c OBJ_EXT=.bc CC=emcc CXX=emcc CFLAGS="-Os" libf2c.bc
74-
cp simulation/libf2c/libf2c.bc emcc/libf2c.so
7562
emcc/libSimulationRuntimeC.so: expat.h
76-
emmake $(MAKE) OBJ_EXT=.bc CC=emcc CXX=emcc CFLAGS=" $(CPPFLAGS) -Os -DOMC_EMCC -DNO_INTERACTIVE_DEPENDENCY -I./simulation/libf2c/" libSimulationRuntimeC.bc
63+
emmake $(MAKE) OBJ_EXT=.bc CC=emcc CXX=emcc CFLAGS=" $(CPPFLAGS) -Os -DOMC_EMCC -DNO_INTERACTIVE_DEPENDENCY" libSimulationRuntimeC.bc
7764
cp libSimulationRuntimeC.bc emcc/libSimulationRuntimeC.so
7865
mdpad.tar.gz:
7966
wget -O mdpad.tar.gz https://github.com/sjoelund/mdpad/tarball/484fe6bfd592a0f549ce7269cab34fc793d0c1cb

‎configure.in‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ AC_SUBST(IPOPT_CFLAGS)
4242
AC_SUBST(QMAKE)
4343
AC_SUBST(EXE)
4444
AC_SUBST(SOURCE_REVISION)
45-
AC_SUBST(LIBF2C)
4645
AC_SUBST(OMSHELL_TERMINAL)
4746
AC_SUBST(MODELICA_SPEC_PLATFORM)
4847
AC_SUBST(OPENMODELICA_SPEC_PLATFORM)
@@ -84,7 +83,6 @@ AC_SUBST(CONFIG_WITH_OPENMP)
8483
AC_SUBST(OPENBLAS_EXTRA_ARGS)
8584
AC_SUBST(AR)
8685
AC_SUBST(AR_SH)
87-
AC_SUBST(CPPFLAGS_F2C)
8886
AC_SUBST(LDFLAGS_SOCKET)
8987
AC_SUBST(APP)
9088
AC_SUBST(OMC)
@@ -177,7 +175,7 @@ if echo $CFLAGS | grep -q -- -fPIC; then
177175
else
178176
CFLAGS_BEFORE="$CFLAGS"
179177
CFLAGS="$CFLAGS -fPIC -Werror"
180-
AC_TRY_LINK([void abc() {}], [abc();], [AC_MSG_RESULT([adding -fPIC]); CFLAGS="$CFLAGS_BEFORE -fPIC"; FPIC="-fPIC"], [AC_MSG_RESULT([don't need -fPIC]); CFLAGS="$CFLAGS_BEFORE"])
178+
AC_TRY_LINK([void abc() {}], [abc();], [AC_MSG_RESULT([adding -fPIC]); CFLAGS="$CFLAGS_BEFORE -fPIC"; FPIC="-fPIC"], [AC_MSG_RESULT([does not need -fPIC]); CFLAGS="$CFLAGS_BEFORE"])
181179
fi
182180

183181
fi
@@ -238,10 +236,6 @@ AC_HEADER_STDC
238236
AC_CHECK_HEADERS(sys/time.h, [], [AC_MSG_ERROR(Missing header files)])
239237
# AC_CHECK_HEADERS(sqlite3.h, [], [AC_MSG_ERROR(Missing header files)])
240238

241-
# OSX and other systems might have different sizes in f2c headers. Let's always use our own...
242-
# AC_CHECK_HEADERS(f2c.h, [], [LIBF2C=libf2c/libf2c.a])
243-
LIBF2C=libf2c/libf2c.a
244-
245239
AC_MSG_CHECKING([for antlr.Tool support])
246240
omc_antlr_jar=build/share/omc/java/antlr-3.1.3.jar
247241
mkdir -p build/share/omc/java
@@ -771,7 +765,7 @@ if test "$DARWIN" = "1"; then
771765
LIBCMINPACKLIB=libcminpack.dylib
772766
CMINPACKLIB_SHARED=ON
773767
RT_LDFLAGS_SIM="$LDFLAGS $RT_LDFLAGS -lexpat -lgc -lpthread -lm $LIBDL -lstdc++"
774-
RT_LDFLAGS_SIM_OPTIONAL="$SUNDIALS_LDFLAGS $IPOPT_LDFLAGS $UMFPACK_LDFLAGS -llis -lcdaskr -lcminpack -lf2c -liconv"
768+
RT_LDFLAGS_SIM_OPTIONAL="$SUNDIALS_LDFLAGS $IPOPT_LDFLAGS $UMFPACK_LDFLAGS -llis -lcdaskr -lcminpack -liconv"
775769
RT_LDFLAGS="$LDFLAGS $RT_LDFLAGS $LD_LAPACK -lgc -lm -lpthread $LIBDL -lstdc++"
776770
RT_LDFLAGS_OPTIONAL="$RT_LDFLAGS_OPTIONAL -liconv"
777771
# All libraries are dynamically linked; we don't need anything else
@@ -800,7 +794,7 @@ elif test "$host" = "i586-pc-mingw32msvc"; then
800794
LIBCMINPACKLIB=libcminpack.a
801795
CMINPACKLIB_SHARED=OFF
802796
RT_LDFLAGS_SIM="$LDFLAGS $RT_LDFLAGS -lstdc++ -lgc -lexpat -lm"
803-
RT_LDFLAGS_SIM_OPTIONAL="$SUNDIALS_LDFLAGS $IPOPT_LDFLAGS $UMFPACK_LDFLAGS -llis -lcminpack -lf2c"
797+
RT_LDFLAGS_SIM_OPTIONAL="$SUNDIALS_LDFLAGS $IPOPT_LDFLAGS $UMFPACK_LDFLAGS -llis -lcminpack"
804798
RT_LDFLAGS="$LDFLAGS $RT_LDFLAGS $LD_LAPACK -lgc -lexpat -lpthread -lm"
805799
RT_LDFLAGS_OPTIONAL="$RT_LDFLAGS_OPTIONAL"
806800
RT_LDFLAGS_GENERATED_CODE="$LDFLAGS -lOpenModelicaRuntimeC $RT_LDFLAGS"
@@ -810,7 +804,6 @@ elif test "$host" = "i586-pc-mingw32msvc"; then
810804
RPATH_QMAKE="-Wl,-z,origin -Wl,-rpath,\\'\\\$\$ORIGIN/../lib/omc\\' -Wl,-rpath,\\'\\\$\$ORIGIN\\'"
811805
OS_TARGET="windows"
812806
AR_SH="$AR -ru"
813-
CPPFLAGS_F2C=" -DUSE_CLOCK"
814807
LDFLAGS_SOCKET=" -lwsock32"
815808
BOOTSTRAP_STATIC="static"
816809
else
@@ -828,7 +821,7 @@ else
828821
# For static runtime on Linux:
829822
# -Wl,-whole-archive -lSimulationRuntimeC -Wl,-no-whole-archive
830823
RT_LDFLAGS_SIM="$LDFLAGS -Wl,-z,origin -Wl,-rpath,'\$\$ORIGIN' $RT_LDFLAGS $LIBRT -lexpat -lgc -lpthread -lm $LIBDL -lstdc++ -rdynamic"
831-
RT_LDFLAGS_SIM_OPTIONAL="$SUNDIALS_LDFLAGS $IPOPT_LDFLAGS $UMFPACK_LDFLAGS -llis -lcdaskr -lcminpack -Wl,-Bstatic -lf2c -Wl,-Bdynamic"
824+
RT_LDFLAGS_SIM_OPTIONAL="$SUNDIALS_LDFLAGS $IPOPT_LDFLAGS $UMFPACK_LDFLAGS -llis -lcdaskr -lcminpack"
832825
RT_LDFLAGS="$LDFLAGS $RT_LDFLAGS $LD_LAPACK -lgc $LIBRT -lpthread -lm $LIBDL -lstdc++ -rdynamic"
833826
RT_LDFLAGS_OPTIONAL="$RT_LDFLAGS_OPTIONAL"
834827
# All libraries are dynamically linked; we don't need anything else
@@ -931,7 +924,6 @@ OMOptimBasis/build/Makefile.unix \
931924
OMOptimBasis/build/OMOptimBasis.config \
932925
OMVisualize/OMVisualizeGUI/OMVisualizeGUI.config \
933926
SimulationRuntime/c/Makefile \
934-
SimulationRuntime/c/simulation/libf2c/makefile.u \
935927
SimulationRuntime/ParModelica/explicit/openclrt/Makefile \
936928
mosh/src/Makefile \
937929
Compiler/boot/Makefile \

0 commit comments

Comments
 (0)