summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulian de Bhal <julian.debhal@nokia.com>2009-05-25 03:53:35 (GMT)
committerJulian de Bhal <julian.debhal@nokia.com>2009-05-25 03:53:35 (GMT)
commit2a6ecd73faee2d6d9db2b5f8b895d52cd31b0e27 (patch)
treebceb07f3d29a6669bc27ee1bc7c6eead6028eae1
parent98c4fb27bb930f19365395a3fd75e4c3012640cb (diff)
downloadQt-2a6ecd73faee2d6d9db2b5f8b895d52cd31b0e27.zip
Qt-2a6ecd73faee2d6d9db2b5f8b895d52cd31b0e27.tar.gz
Qt-2a6ecd73faee2d6d9db2b5f8b895d52cd31b0e27.tar.bz2
Update mkspecs for linux-g++-x11
Change QMAKE_INCDIR_OPENGL and QMAKE_LIBDIR_OPENGL to QMAKE_INCDIR_OPENGL_QT and QMAKE_LIBDIR_OPENGL_QT so qmake will pick them up.
-rw-r--r--mkspecs/linux-g++-x11egl/qmake.conf3
1 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/linux-g++-x11egl/qmake.conf b/mkspecs/linux-g++-x11egl/qmake.conf
index 3442d70..e9e5abc 100644
--- a/mkspecs/linux-g++-x11egl/qmake.conf
+++ b/mkspecs/linux-g++-x11egl/qmake.conf
@@ -13,7 +13,10 @@ include(../common/linux.conf)
load(qt_config)
QMAKE_INCDIR_OPENGL = $(HOME)/opengles2/SDKPackage/Builds/OGLES2/Include
+QMAKE_INCDIR_OPENGL_QT = $(HOME)/opengles2/SDKPackage/Builds/OGLES2/Include
+
QMAKE_LIBDIR_OPENGL = $(HOME)/opengles2/SDKPackage/Builds/OGLES2/LinuxPC/Lib
+QMAKE_LIBDIR_OPENGL_QT = $(HOME)/opengles2/SDKPackage/Builds/OGLES2/LinuxPC/Lib
QMAKE_LIBS_OPENGL = -lGLESv2 -lEGL
QMAKE_LIBS += -Wl,-rpath=$(HOME)/opengles2/SDKPackage/Builds/OGLES2/LinuxPC/Lib