Skip to content

Commit

Permalink
Remove libinteractive stuff
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@24199 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Jan 26, 2015
1 parent bfd6aee commit e60bd94
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions configure.in
Expand Up @@ -768,7 +768,7 @@ if test "$DARWIN" = "1"; then
FMILIB_SHARED=ON
LIBCMINPACKLIB=libcminpack.dylib
CMINPACKLIB_SHARED=ON
RT_LDFLAGS_SIM="$LDFLAGS $RT_LDFLAGS $SUNDIALS_LDFLAGS $IPOPT_LDFLAGS $UMFPACK_LDFLAGS -linteractive -llis -lcdaskr -lcminpack -lf2c -lexpat -liconv -lgc -lpthread -lm $LIBDL -lstdc++"
RT_LDFLAGS_SIM="$LDFLAGS $RT_LDFLAGS $SUNDIALS_LDFLAGS $IPOPT_LDFLAGS $UMFPACK_LDFLAGS -llis -lcdaskr -lcminpack -lf2c -lexpat -liconv -lgc -lpthread -lm $LIBDL -lstdc++"
RT_LDFLAGS="$LDFLAGS $RT_LDFLAGS $LD_LAPACK -liconv -lgc -lpthread -lm $LIBDL -lstdc++"
# All libraries are dynamically linked; we don't need anything else
RT_LDFLAGS_GENERATED_CODE="$LDFLAGS -lOpenModelicaRuntimeC $LD_LAPACK -lm"
Expand All @@ -795,7 +795,7 @@ elif test "$host" = "i586-pc-mingw32msvc"; then
FMILIB_SHARED=OFF
LIBCMINPACKLIB=libcminpack.a
CMINPACKLIB_SHARED=OFF
RT_LDFLAGS_SIM="$LDFLAGS $RT_LDFLAGS $SUNDIALS_LDFLAGS $IPOPT_LDFLAGS $UMFPACK_LDFLAGS -linteractive -llis -lcminpack -lstdc++ -lf2c -lgc -lexpat -lm"
RT_LDFLAGS_SIM="$LDFLAGS $RT_LDFLAGS $SUNDIALS_LDFLAGS $IPOPT_LDFLAGS $UMFPACK_LDFLAGS -llis -lcminpack -lstdc++ -lf2c -lgc -lexpat -lm"
RT_LDFLAGS="$LDFLAGS $RT_LDFLAGS $LD_LAPACK -lgc -lexpat -lpthread -lm"
RT_LDFLAGS_GENERATED_CODE="$LDFLAGS -lOpenModelicaRuntimeC $RT_LDFLAGS"
RT_LDFLAGS_GENERATED_CODE_SIM="$LDFLAGS -lSimulationRuntimeC -lcdaskr $RT_LDFLAGS_SIM"
Expand All @@ -821,7 +821,7 @@ else
CMINPACKLIB_SHARED=ON
# For static runtime on Linux:
# -Wl,-whole-archive -lSimulationRuntimeC -Wl,-no-whole-archive
RT_LDFLAGS_SIM="$LDFLAGS -Wl,-z,origin -Wl,-rpath,'\$\$ORIGIN' $RT_LDFLAGS $SUNDIALS_LDFLAGS $IPOPT_LDFLAGS $UMFPACK_LDFLAGS $LIBRT -linteractive -llis -lcdaskr -lcminpack -Wl,-Bstatic -lf2c -Wl,-Bdynamic -lexpat -lgc $LIBRT -lpthread -lm $LIBDL -lstdc++ -rdynamic"
RT_LDFLAGS_SIM="$LDFLAGS -Wl,-z,origin -Wl,-rpath,'\$\$ORIGIN' $RT_LDFLAGS $SUNDIALS_LDFLAGS $IPOPT_LDFLAGS $UMFPACK_LDFLAGS $LIBRT -llis -lcdaskr -lcminpack -Wl,-Bstatic -lf2c -Wl,-Bdynamic -lexpat -lgc $LIBRT -lpthread -lm $LIBDL -lstdc++ -rdynamic"
RT_LDFLAGS="$LDFLAGS $RT_LDFLAGS $LD_LAPACK -lgc $LIBRT -lpthread -lm $LIBDL -lstdc++ -rdynamic"
# All libraries are dynamically linked; we don't need anything else
RT_LDFLAGS_GENERATED_CODE="$LDFLAGS -lOpenModelicaRuntimeC $LD_LAPACK -lm -lpthread -rdynamic"
Expand Down Expand Up @@ -925,7 +925,6 @@ OMVisualize/OMVisualizeGUI/OMVisualizeGUI.config \
SimulationRuntime/c/Makefile \
SimulationRuntime/c/simulation/libf2c/makefile.u \
SimulationRuntime/ParModelica/explicit/openclrt/Makefile \
SimulationRuntime/interactive/Makefile \
mosh/src/Makefile \
Compiler/boot/Makefile \
"
Expand Down

0 comments on commit e60bd94

Please sign in to comment.