diff options
| author | Ritt Konstantin <ritt.ks@gmail.com> | 2011-01-20 11:08:41 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-01-20 15:38:03 (GMT) |
| commit | e0c2861976e06658a1d651941310407c15b0bcde (patch) | |
| tree | d167628ef40f416c463a0d9d88f943cfef516f11 | |
| parent | 6551a2933126cc86ac4c1e5265e967100d240fb0 (diff) | |
| download | Qt-e0c2861976e06658a1d651941310407c15b0bcde.zip Qt-e0c2861976e06658a1d651941310407c15b0bcde.tar.gz Qt-e0c2861976e06658a1d651941310407c15b0bcde.tar.bz2 | |
fix build with -opengl es1 in some cases
try <GLES/egl.h> first, and if that fails, try <EGL/egl.h>. if
CFG_EGL_GLES_INCLUDES is "no", then QT_GLES_EGL is not defined and
type re-definitions in GLES/egltypes.h and EGL/egl.h might occur later.
Merge-request: 1027
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: mariusSO
| -rwxr-xr-x | configure | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -6058,14 +6058,14 @@ fi # QWS if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then if [ "$CFG_EGL" != "no" ]; then # detect EGL support - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/egl" "EGL (EGL/egl.h)" $L_FLAGS $I_FLAGS $l_FLAGS; then - # EGL specified by QMAKE_*_EGL, included with <EGL/egl.h> - CFG_EGL=yes - CFG_EGL_GLES_INCLUDES=no - elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/egl4gles1" "EGL (GLES/egl.h)" $L_FLAGS $I_FLAGS $l_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/egl4gles1" "EGL (GLES/egl.h)" $L_FLAGS $I_FLAGS $l_FLAGS; then # EGL specified by QMAKE_*_EGL, included with <GLES/egl.h> CFG_EGL=yes CFG_EGL_GLES_INCLUDES=yes + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/egl" "EGL (EGL/egl.h)" $L_FLAGS $I_FLAGS $l_FLAGS; then + # EGL specified by QMAKE_*_EGL, included with <EGL/egl.h> + CFG_EGL=yes + CFG_EGL_GLES_INCLUDES=no else if [ "$CFG_EGL" = "yes" ]; then echo "The EGL functionality test failed!" |