diff options
| author | Marius Kintel <marius@kintel.net> | 2011-12-19 14:41:11 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-12-19 14:41:11 (GMT) |
| commit | 87ce149df2581361e8975bd1a0addf2b6ef61e3d (patch) | |
| tree | c68db815a72cc767b6d51be0a57e9946c5f0a619 /opencsg.pri | |
| parent | ba1f0b7489dd5fa9bdc8c44068040f13113b40d0 (diff) | |
| parent | 638743e2201c6869b48857dd2db5ec01df665162 (diff) | |
Merge branch 'master' into boost_filesystem
Conflicts:
boost.pri
tests/CMakeLists.txt
Diffstat (limited to 'opencsg.pri')
| -rw-r--r-- | opencsg.pri | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/opencsg.pri b/opencsg.pri index d34f11b..ff3bc4d 100644 --- a/opencsg.pri +++ b/opencsg.pri @@ -1,20 +1,14 @@ opencsg { DEFINES += ENABLE_OPENCSG CONFIG += glew - include(glew.pri) - HEADERS += src/OpenCSGRenderer.h - SOURCES += src/OpenCSGRenderer.cc - - isEmpty(DEPLOYDIR) { - # 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") - } + # Optionally specify location of OpenCSG using the + # OPENCSGDIR env. variable + OPENCSG_DIR = $$(OPENCSGDIR) + !isEmpty(OPENCSG_DIR) { + QMAKE_INCDIR += $$OPENCSG_DIR/include + QMAKE_LIBDIR += $$OPENCSG_DIR/lib + message("OpenCSG location: $$OPENCSG_DIR") } LIBS += -lopencsg |