diff options
| author | kintel <kintel@b57f626f-c46c-0410-a088-ec61d464b74c> | 2010-05-10 17:43:42 (GMT) |
|---|---|---|
| committer | kintel <kintel@b57f626f-c46c-0410-a088-ec61d464b74c> | 2010-05-10 17:43:42 (GMT) |
| commit | db3e4478091b98fc84bad14533147cb508feff5c (patch) | |
| tree | c97301686f31446ce0527fa4c2b116252ca3428c | |
| parent | 203858f6b508f10743960efa88221e65deff9e91 (diff) | |
Use DEPLOYDIR independant of deploy config
git-svn-id: http://svn.clifford.at/openscad/trunk@542 b57f626f-c46c-0410-a088-ec61d464b74c
| -rw-r--r-- | cgal.pri | 2 | ||||
| -rw-r--r-- | glew.pri | 2 | ||||
| -rw-r--r-- | opencsg.pri | 2 | ||||
| -rw-r--r-- | openscad.pro | 10 |
4 files changed, 8 insertions, 8 deletions
@@ -1,7 +1,7 @@ cgal { DEFINES += ENABLE_CGAL - !deploy { + isEmpty(DEPLOYDIR) { # Optionally specify location of CGAL using the # CGALDIR env. variable CGAL_DIR = $$(CGALDIR) @@ -1,5 +1,5 @@ glew { - !deploy { + isEmpty(DEPLOYDIR) { # Optionally specify location of GLEW using the # GLEWDIR env. variable GLEW_DIR = $$(GLEWDIR) diff --git a/opencsg.pri b/opencsg.pri index a3b70f7..8538f99 100644 --- a/opencsg.pri +++ b/opencsg.pri @@ -6,7 +6,7 @@ opencsg { HEADERS += src/render-opencsg.h SOURCES += src/render-opencsg.cc - !deploy { + isEmpty(DEPLOYDIR) { # Optionally specify location of OpenCSG using the # OPENCSGDIR env. variable OPENCSG_DIR = $$(OPENCSGDIR) diff --git a/openscad.pro b/openscad.pro index e5c740a..42a5d22 100644 --- a/openscad.pro +++ b/openscad.pro @@ -10,15 +10,15 @@ RCC_DIR = objects INCLUDEPATH += src macx { + DEPLOYDIR = $$(MACOSX_DEPLOY_DIR) + !isEmpty(DEPLOYDIR) { + INCLUDEPATH += $$DEPLOYDIR/include + LIBS += -L$$DEPLOYDIR/lib + } # add CONFIG+=deploy to the qmake command-line to make a deployment build deploy { message("Building deployment version") CONFIG += x86 x86_64 - DEPLOYDIR = $$(MACOSX_DEPLOY_DIR) - !isEmpty(DEPLOYDIR) { - INCLUDEPATH += $$DEPLOYDIR/include - LIBS += -L$$DEPLOYDIR/lib - } } TARGET = OpenSCAD |