diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-06-24 04:25:07 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-06-24 04:25:07 (GMT) |
| commit | 94d62da58286df177286adcbe688c40629d2c551 (patch) | |
| tree | 773f3b055e77d1947cc4aba6f556630070017848 /mkspecs/linux-g++-x11egl | |
| parent | 124f5714e8e6ec1945d536e622b51304f2b32dd7 (diff) | |
| parent | 0570b26f90f031b09970f8fca1a67339b66ee33f (diff) | |
| download | Qt-94d62da58286df177286adcbe688c40629d2c551.zip Qt-94d62da58286df177286adcbe688c40629d2c551.tar.gz Qt-94d62da58286df177286adcbe688c40629d2c551.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
mkspecs/features/qt.prf
src/corelib/global/qglobal.h
Diffstat (limited to 'mkspecs/linux-g++-x11egl')
| -rw-r--r-- | mkspecs/linux-g++-x11egl/qmake.conf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mkspecs/linux-g++-x11egl/qmake.conf b/mkspecs/linux-g++-x11egl/qmake.conf index e9e5abc..50c1d68 100644 --- a/mkspecs/linux-g++-x11egl/qmake.conf +++ b/mkspecs/linux-g++-x11egl/qmake.conf @@ -12,6 +12,10 @@ include(../common/g++.conf) include(../common/linux.conf)
load(qt_config)
+QMAKE_INCDIR_EGL = $(HOME)/opengles2/SDKPackage/Builds/OGLES2/Include
+QMAKE_LIBDIR_EGL = $(HOME)/opengles2/SDKPackage/Builds/OGLES2/LinuxPC/Lib
+QMAKE_LIBS_EGL = -lGLESv2 -lEGL
+
QMAKE_INCDIR_OPENGL = $(HOME)/opengles2/SDKPackage/Builds/OGLES2/Include
QMAKE_INCDIR_OPENGL_QT = $(HOME)/opengles2/SDKPackage/Builds/OGLES2/Include
|