From 0340e120820000f27bdda75b88c7eac15a5b4f4f Mon Sep 17 00:00:00 2001 From: kintel Date: Sun, 3 Jan 2010 01:31:09 +0000 Subject: Make the OPENCSGDIR variable optional on all platforms git-svn-id: http://svn.clifford.at/openscad/trunk@194 b57f626f-c46c-0410-a088-ec61d464b74c diff --git a/openscad.pro b/openscad.pro index 5dcfb64..00b23be 100644 --- a/openscad.pro +++ b/openscad.pro @@ -18,7 +18,7 @@ QT += opengl # Application configuration CONFIG += debug # CONFIG += release -#CONFIG += mdi +CONFIG += mdi CONFIG += cgal CONFIG += opencsg @@ -44,12 +44,16 @@ cgal { opencsg { DEFINES += ENABLE_OPENCSG - LIBS += -L/opt/local/lib -lopencsg + LIBS += -lopencsg unix:LIBS += -lGLEW win32:LIBS += -lglew32 - macx { - INCLUDEPATH += $(OPENCSGDIR)/include /opt/local/include - LIBS += -L$(OPENCSGDIR)/lib + + # 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 } } -- cgit v0.10.1