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 /mkspecs/common | |
| 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 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/linux.conf | 9 | ||||
| -rw-r--r-- | mkspecs/common/wince/qmake.conf | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf index cc5c38b..1ae5608 100644 --- a/mkspecs/common/linux.conf +++ b/mkspecs/common/linux.conf @@ -13,6 +13,12 @@ QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib +QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL +QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL +QMAKE_INCDIR_OPENGL_ES1CL = $$QMAKE_INCDIR_OPENGL +QMAKE_LIBDIR_OPENGL_ES1CL = $$QMAKE_LIBDIR_OPENGL +QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL +QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL QMAKE_INCDIR_EGL = QMAKE_LIBDIR_EGL = QMAKE_INCDIR_OPENVG = @@ -26,6 +32,9 @@ QMAKE_LIBS_NIS = -lnsl QMAKE_LIBS_EGL = -lEGL QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL +QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM +QMAKE_LIBS_OPENGL_ES1CL = -lGLES_CL +QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 QMAKE_LIBS_OPENVG = -lOpenVG QMAKE_LIBS_THREAD = -lpthread diff --git a/mkspecs/common/wince/qmake.conf b/mkspecs/common/wince/qmake.conf index d6e4ba7..d87be02 100644 --- a/mkspecs/common/wince/qmake.conf +++ b/mkspecs/common/wince/qmake.conf @@ -64,6 +64,10 @@ QMAKE_LIBS_NETWORK = ws2.lib QMAKE_LIBS_OPENGL = QMAKE_LIBS_COMPAT = +QMAKE_LIBS_OPENGL_ES1 = libGLES_CM.lib +QMAKE_LIBS_OPENGL_ES1CL = libGLES_CL.lib +QMAKE_LIBS_OPENGL_ES2 = libGLESv2.lib + QMAKE_LIBS_QT_ENTRY = -lqtmain QMAKE_MOC = $$[QT_INSTALL_BINS]\moc.exe |