Improved Mac OS X deployment - hopefully this doesn't break builds on other platforms

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

1 files changed, 15 insertions, 17 deletions

diff --git a/opencsg.pri b/opencsg.pri
index c9ed990..a3b70f7 100644
--- a/opencsg.pri
+++ b/opencsg.pri
@@ -1,23 +1,21 @@
 opencsg {
+  DEFINES += ENABLE_OPENCSG
+  CONFIG += glew
+  include(glew.pri)
+
   HEADERS += src/render-opencsg.h
   SOURCES += src/render-opencsg.cc
 
-  DEFINES += ENABLE_OPENCSG
-  LIBS += -lopencsg
-  unix:LIBS += -lGLEW
-  win32:LIBS += -lglew32
-
-  # Optionally specify location of OpenCSG using the 
-  # OPENCSGDIR env. variable
-  OPENCSG_DIR = $$(OPENCSGDIR)
-  !isEmpty(OPENCSG_DIR) {
-    INCLUDEPATH += $$OPENCSG_DIR/include
-    LIBS += -L$$OPENCSG_DIR/lib
-    message("OpenCSG location: $$CGAL_DIR")
-  }
-  macx {
-    # For glew
-    INCLUDEPATH += /opt/local/include
-    LIBS += -L/opt/local/lib
+  !deploy {
+    # Optionally specify location of OpenCSG using the 
+    # OPENCSGDIR env. variable
+    OPENCSG_DIR = $$(OPENCSGDIR)
+    !isEmpty(OPENCSG_DIR) {
+      INCLUDEPATH += $$OPENCSG_DIR/include
+      LIBS += -L$$OPENCSG_DIR/lib
+      message("OpenCSG location: $$OPENCSG_DIR")
+    }
   }
+
+  LIBS += -lopencsg
 }