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 /glew.pri | |
| parent | ba1f0b7489dd5fa9bdc8c44068040f13113b40d0 (diff) | |
| parent | 638743e2201c6869b48857dd2db5ec01df665162 (diff) | |
Merge branch 'master' into boost_filesystem
Conflicts:
boost.pri
tests/CMakeLists.txt
Diffstat (limited to 'glew.pri')
| -rw-r--r-- | glew.pri | 21 |
1 files changed, 7 insertions, 14 deletions
@@ -1,21 +1,14 @@ glew { - isEmpty(DEPLOYDIR) { - # Optionally specify location of GLEW using the - # GLEWDIR env. variable - GLEW_DIR = $$(GLEWDIR) - isEmpty(GLEW_DIR) { - # Default to MacPorts on Mac OS X - macx: GLEW_DIR = /opt/local - } - !isEmpty(GLEW_DIR) { - INCLUDEPATH += $$GLEW_DIR/include - LIBS += -L$$GLEW_DIR/lib - message("GLEW location: $$GLEW_DIR") - } + # Optionally specify location of GLEW using the + # GLEWDIR env. variable + GLEW_DIR = $$(GLEWDIR) + !isEmpty(GLEW_DIR) { + QMAKE_INCDIR += $$GLEW_DIR/include + QMAKE_LIBDIR += $$GLEW_DIR/lib + message("GLEW location: $$GLEW_DIR") } unix:LIBS += -lGLEW win32:LIBS += -lglew32s CONFIG(mingw-cross-env):DEFINES += GLEW_STATIC } - |