diff options
author | Donald Carr <donald.carr@nokia.com> | 2012-04-16 05:04:33 +0000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-16 22:55:26 +0200 |
commit | d4c4723583d7e2ec3b98d0b7fab98b9f7e1a87e8 (patch) | |
tree | 3db1966dd28c9d00b4334c2d5eee061ad7d866e3 /configure | |
parent | 6e1594e456a6d4540195be3b46c345256da54841 (diff) |
Remove incorrect inclusion of GL support headers given EGL presence
The include files have a hard dependency on OpenGL (ES2); testing for the
presence of EGL support is insufficient grounds for including this
functionality
Change-Id: I391b5dbbcbef40ecf68d16617b6eb1c0bb4b799e
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -3148,7 +3148,7 @@ Additional options: $XCBY -xcb ............... Compile Xcb support. $EGLFSN -no-eglfs .......... Do not compile EGLFS (EGL Full Screen/Single Surface) support. - $EGLFSY -eglfs ............. Compile EGLFS support. + $EGLFSY -eglfs ............. Compile EGLFS support (Requires OpenGL ES 2 support). $DFBN -no-directfb ....... Do not compile DirectFB support. $DFBY -directfb .......... Compile DirectFB support. @@ -3927,6 +3927,11 @@ if [ "$CFG_EGLFS" = "yes" ]; then echo "The EGLFS plugin requires EGL support and cannot be built" exit 101 fi + if [ "$CFG_OPENGL" != "es2" ]; then + echo "The EGLFS plugin requires OpenGL ES 2 support and cannot be built" + exit 101 + fi + CFG_OPENGL="es2" CFG_EGL=yes fi @@ -4668,7 +4673,11 @@ elif [ "$CFG_OPENGL" = "desktop" ]; then fi if [ "$CFG_EGLFS" != "no" ]; then - CFG_EGLFS="$CFG_EGL" + if [ "$CFG_OPENGL" = "es2" ]; then + CFG_EGLFS="$CFG_EGL" + else + CFG_EGLFS="no" + fi fi if [ -n "$QMAKE_CFLAGS_XCB" ] || [ -n "$QMAKE_LIBS_XCB" ]; then |