From db3e4478091b98fc84bad14533147cb508feff5c Mon Sep 17 00:00:00 2001
From: kintel <kintel@b57f626f-c46c-0410-a088-ec61d464b74c>
Date: Mon, 10 May 2010 17:43:42 +0000
Subject: Use DEPLOYDIR independant of deploy config

git-svn-id: http://svn.clifford.at/openscad/trunk@542 b57f626f-c46c-0410-a088-ec61d464b74c

diff --git a/cgal.pri b/cgal.pri
index 0c1fd30..23f0c8c 100644
--- a/cgal.pri
+++ b/cgal.pri
@@ -1,7 +1,7 @@
 cgal {
   DEFINES += ENABLE_CGAL
 
-  !deploy {
+  isEmpty(DEPLOYDIR) {
     # Optionally specify location of CGAL using the 
     # CGALDIR env. variable
     CGAL_DIR = $$(CGALDIR)
diff --git a/glew.pri b/glew.pri
index 67ed68f..189b953 100644
--- a/glew.pri
+++ b/glew.pri
@@ -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
-- 
cgit v0.10.1