Skip to content

Commit

Permalink
Compile Modelica3D on OSX
Browse files Browse the repository at this point in the history
  • Loading branch information
sjoelund authored and OpenModelica-Hudson committed Jun 22, 2015
1 parent 6011d62 commit 308e800
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile.in
Expand Up @@ -5,9 +5,9 @@ all: @ALL_TARGETS@ @OMLIBRARY_TARGET@
omc:
$(MAKE) -C OMCompiler @OMC_TARGET@
omlibrary-core:
$(MAKE) -C libraries BUILD_DIR=@OMBUILDDIR@/lib/omlibrary "host_short=@host_short@" "RPATH_QMAKE=@RPATH_QMAKE@" "SHREXT=@SHREXT@" "MODELICA3D_TARGET=@MODELICA3D_TARGET@" core
$(MAKE) -C libraries BUILD_DIR=@OMBUILDDIR@/lib/omlibrary "host_short=@host_short@" "RPATH_QMAKE=@RPATH_QMAKE@ @CMAKE_LDFLAGS@" "SHREXT=@SHREXT@" "MODELICA3D_TARGET=@MODELICA3D_TARGET@" core
omlibrary-all:
$(MAKE) -C libraries BUILD_DIR=@OMBUILDDIR@/lib/omlibrary "host_short=@host_short@" "RPATH_QMAKE=@RPATH_QMAKE@" "SHREXT=@SHREXT@" "MODELICA3D_TARGET=@MODELICA3D_TARGET@" all
$(MAKE) -C libraries BUILD_DIR=@OMBUILDDIR@/lib/omlibrary "host_short=@host_short@" "RPATH_QMAKE=@RPATH_QMAKE@ @CMAKE_LDFLAGS@" "SHREXT=@SHREXT@" "MODELICA3D_TARGET=@MODELICA3D_TARGET@" all
omplot: omc
$(MAKE) -C OMPlot
omedit: omc omplot
Expand Down
5 changes: 5 additions & 0 deletions configure.ac
Expand Up @@ -67,6 +67,11 @@ AC_MSG_RESULT([yes])
MODELICA3D_TARGET="omlibrary-modelica3d"
fi

AC_SUBST(CMAKE_LDFLAGS)
if echo $host | grep -i darwin; then
CMAKE_LDFLAGS="-Wl,-undefined -Wl,dynamic_lookup"
fi

AC_SUBST(ALL_TARGETS)
for dir_target in OMCompiler-omc OMPlot-omplot OMEdit-omedit OMNotebook-omnotebook OMOptim-omoptim OMShell-omshell; do
dir=`echo $dir_target | cut -d- -f1`
Expand Down

0 comments on commit 308e800

Please sign in to comment.