diff options
| author | kintel <kintel@b57f626f-c46c-0410-a088-ec61d464b74c> | 2010-03-31 00:25:04 (GMT) |
|---|---|---|
| committer | kintel <kintel@b57f626f-c46c-0410-a088-ec61d464b74c> | 2010-03-31 00:25:04 (GMT) |
| commit | 334f15c0d6442fbbcbe0b83cad57b3b3413d470b (patch) | |
| tree | 3667c8329e1398b4397f20c2c4e0d767a69a97b6 | |
| parent | 1950fc593d702aca6024395ed59c0e34e6dcaf52 (diff) | |
Minor build system fixes
git-svn-id: http://svn.clifford.at/openscad/trunk@492 b57f626f-c46c-0410-a088-ec61d464b74c
| -rw-r--r-- | cgal.pri | 14 | ||||
| -rw-r--r-- | opencsg.pri | 1 | ||||
| -rw-r--r-- | openscad.pro | 17 | ||||
| -rwxr-xr-x | scripts/publish-macosx.sh | 1 | ||||
| -rw-r--r-- | setenv_mjau.sh | 1 |
5 files changed, 17 insertions, 17 deletions
@@ -1,12 +1,18 @@ cgal { -# Uncomment this to enable experimental CGAL tesselation -# DEFINES += CGAL_TESSELATE DEFINES += ENABLE_CGAL LIBS += -lCGAL + + # Optionally specify location of CGAL using the + # CGALDIR env. variable + CGAL_DIR = $$(CGALDIR) + !isEmpty(CGAL_DIR) { + INCLUDEPATH += $$CGAL_DIR/include + LIBS += -L$$CGAL_DIR/lib + message("CGAL location: $$CGAL_DIR") + } macx { - INCLUDEPATH += $(PWD)/../install/include /opt/local/include # The -L/usr/lib is to force the linker to use system libraries over MacPort libraries - LIBS += -L/usr/lib -L$(PWD)/../install/lib -L/opt/local/lib /opt/local/lib/libgmp.a /opt/local/lib/libmpfr.a /opt/local/lib/libboost_thread-mt.a + LIBS += -L/usr/lib -L/opt/local/lib /opt/local/lib/libgmp.a /opt/local/lib/libmpfr.a /opt/local/lib/libboost_thread-mt.a } else { LIBS += -lmpfr diff --git a/opencsg.pri b/opencsg.pri index 3f3695d..c9ed990 100644 --- a/opencsg.pri +++ b/opencsg.pri @@ -13,6 +13,7 @@ opencsg { !isEmpty(OPENCSG_DIR) { INCLUDEPATH += $$OPENCSG_DIR/include LIBS += -L$$OPENCSG_DIR/lib + message("OpenCSG location: $$CGAL_DIR") } macx { # For glew diff --git a/openscad.pro b/openscad.pro index d0b0c5a..b6d655c 100644 --- a/openscad.pro +++ b/openscad.pro @@ -50,20 +50,11 @@ progresswidget { include(cgal.pri) include(opencsg.pri) +include(eigen2.pri) -# Optionally specify location of Eigen2 using the -# EIGEN2DIR env. variable -EIGEN2_DIR = $$(EIGEN2DIR) -!isEmpty(EIGEN2_DIR) { - INCLUDEPATH += $$EIGEN2_DIR -} -else { - macx { - INCLUDEPATH += /opt/local/include/eigen2 - } - else { - INCLUDEPATH += /usr/include/eigen2 - } +# Standard include path for misc external libs +macx { + INCLUDEPATH += /opt/local/include } # QMAKE_CFLAGS += -pg diff --git a/scripts/publish-macosx.sh b/scripts/publish-macosx.sh index 56e5367..399080e 100755 --- a/scripts/publish-macosx.sh +++ b/scripts/publish-macosx.sh @@ -4,6 +4,7 @@ VERSION=`date "+%Y.%m.%d"` #VERSION=2010.02 export OPENCSGDIR=$PWD/../OpenCSG-1.3.0 +export CGALDIR=$PWD/../install export EIGEN2DIR=/opt/local/include/eigen2 `dirname $0`/release-common.sh -v $VERSION diff --git a/setenv_mjau.sh b/setenv_mjau.sh index 253f440..2188687 100644 --- a/setenv_mjau.sh +++ b/setenv_mjau.sh @@ -1,2 +1,3 @@ export OPENCSGDIR=$PWD/../OpenCSG-1.3.0 +export CGALDIR=$PWD/../install export DYLD_LIBRARY_PATH=$OPENCSGDIR/lib:$QCODEEDITDIR/lib |