diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-04-01 14:26:56 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-04-01 14:26:56 (GMT) |
| commit | 64e640716204af69056c34ddac5ce26628a1edd2 (patch) | |
| tree | 9892fa344d4d24a2e8b3e352137dec5ff4ed56a0 | |
| parent | b644388c82438f64566857abf84bf5d6be1238a0 (diff) | |
| download | Qt-64e640716204af69056c34ddac5ce26628a1edd2.zip Qt-64e640716204af69056c34ddac5ce26628a1edd2.tar.gz Qt-64e640716204af69056c34ddac5ce26628a1edd2.tar.bz2 | |
Add the auto detection for OpenGL in configure for makefile build system on Symbian.
Task-number: QTBUG-18485
Reviewed-by: Miikka Heikkinen
Reviewed-by: axis
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | mkspecs/common/symbian/symbian-makefile.conf | 11 |
2 files changed, 14 insertions, 3 deletions
@@ -3244,7 +3244,7 @@ if [ "$PLATFORM_QWS" = "yes" ] && [ "$CFG_OPENGL" = "auto" ]; then fi # mac -if [ "$PLATFORM_MAC" = "yes" ]; then +if [ "$PLATFORM_MAC" = "yes"] && [ "$XPLATFORM_SYMBIAN" = "no" ]; then if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then CFG_OPENGL=desktop fi @@ -5537,8 +5537,8 @@ if [ "$PLATFORM_X11" = "yes" ]; then fi fi -# X11/MINGW OpenGL -if [ "$PLATFORM_X11" = "yes" -o "$XPLATFORM_MINGW" = "yes" ]; then +# X11/MINGW/SYMBIAN OpenGL +if [ "$PLATFORM_X11" = "yes" -o "$XPLATFORM_MINGW" = "yes" -o "$XPLATFORM_SYMBIAN" = "yes" ]; then # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es2 = OpenGL ES 2.x) if [ "$CFG_GUI" = "no" ]; then if [ "$CFG_OPENGL" = "auto" ]; then diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf index b248117..a725df3 100644 --- a/mkspecs/common/symbian/symbian-makefile.conf +++ b/mkspecs/common/symbian/symbian-makefile.conf @@ -10,6 +10,17 @@ contains(QMAKE_HOST.os,Windows) { include(symbian.conf) +QMAKE_INCDIR_OPENGL = $${EPOCROOT}epoc32/include +QMAKE_LIBDIR_OPENGL = $${EPOCROOT}epoc32/release/armv5/lib +QMAKE_INCDIR_OPENGL_ES1 = $${EPOCROOT}epoc32/include/GLES +QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL +QMAKE_INCDIR_OPENGL_ES2 = $${EPOCROOT}epoc32/include/GLES2 +QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL +QMAKE_INCDIR_EGL = $${EPOCROOT}epoc32/include/EGL +QMAKE_LIBDIR_EGL = $$QMAKE_LIBDIR_OPENGL +QMAKE_INCDIR_OPENVG = $${EPOCROOT}epoc32/include/VG +QMAKE_LIBDIR_OPENVG = $$QMAKE_LIBDIR_OPENGL + QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src |