diff options
author | Harald Fernengel <harald.fernengel@nokia.com> | 2009-11-02 14:34:27 (GMT) |
---|---|---|
committer | Harald Fernengel <harald.fernengel@nokia.com> | 2009-11-02 14:39:29 (GMT) |
commit | cf800465369fb1ef84e8bddbbbfa7128d95afd27 (patch) | |
tree | fe0eeb3fa54bbae757e77fbf146c63ee84e1c9d1 /config.tests/unix/opengles1cl | |
parent | 016c06f8988c50f0f8309b1b5054ea99ecd1bc6c (diff) | |
download | Qt-cf800465369fb1ef84e8bddbbbfa7128d95afd27.zip Qt-cf800465369fb1ef84e8bddbbbfa7128d95afd27.tar.gz Qt-cf800465369fb1ef84e8bddbbbfa7128d95afd27.tar.bz2 |
Sanitize building Qt with OpenGL ES support
introduce QMAKE_LIBS_OPENGL_ES1, QMAKE_LIBS_OPENGL_ES1CL and
QMAKE_LIBS_OPENGL_ES2 so we do not have to force users to copy/paste
around entire mkspecs just to change the OpenGL backend.
This should make the "-opengl es2" (and friends) configure option
work out of the box with any mkspec on Linux+WinCE.
Also removes a WinCE specific hack that is not required anymore.
Reviewed-by: Tom Cooksey
Reviewed-by: Trond Kjernåsen
Approved-by: Lars Knoll
Diffstat (limited to 'config.tests/unix/opengles1cl')
-rw-r--r-- | config.tests/unix/opengles1cl/opengles1cl.pro | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config.tests/unix/opengles1cl/opengles1cl.pro b/config.tests/unix/opengles1cl/opengles1cl.pro index 415cdbb..c4c069e 100644 --- a/config.tests/unix/opengles1cl/opengles1cl.pro +++ b/config.tests/unix/opengles1cl/opengles1cl.pro @@ -1,9 +1,9 @@ SOURCES = opengles1cl.cpp -INCLUDEPATH += $$QMAKE_INCDIR_OPENGL +INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES1CL -for(p, QMAKE_LIBDIR_OPENGL) { +for(p, QMAKE_LIBDIR_OPENGL_ES1CL) { exists($$p):LIBS += -L$$p } CONFIG -= qt -LIBS += $$QMAKE_LIBS_OPENGL_QT +LIBS += $$QMAKE_LIBS_OPENGL_ES1CL |