summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2011-03-16 14:10:01 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2011-03-16 14:53:15 (GMT)
commitce8fd88984f3da545de8132b6094ed519bdbaa11 (patch)
tree8a3ef96a34619ebe8dfd938da750815173abffb4 /configure
parentd376a506cc25dc2beb5c88ded145bc5e807f9f85 (diff)
downloadQt-ce8fd88984f3da545de8132b6094ed519bdbaa11.zip
Qt-ce8fd88984f3da545de8132b6094ed519bdbaa11.tar.gz
Qt-ce8fd88984f3da545de8132b6094ed519bdbaa11.tar.bz2
Lighthouse: Add pkg-config check for opengl es2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure11
1 files changed, 10 insertions, 1 deletions
diff --git a/configure b/configure
index 2ea3689..bf9d0b4 100755
--- a/configure
+++ b/configure
@@ -6134,7 +6134,16 @@ if [ "$PLATFORM_QPA" = "yes" ]; then
fi
elif [ "$CFG_OPENGL" = "es2" ]; then
#OpenGL ES 2.x
- "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS
+ if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists glesv2 2>/dev/null; then
+ QMAKE_INCDIR_OPENGL_ES2=`$PKG_CONFIG --variable=includedir glesv2 2>/dev/null`
+ QMAKE_LIBDIR_OPENGL_ES2=`$PKG_CONFIG --variable=libdir glesv2 2>/dev/null`
+ QMAKE_LIBS_OPENGL_ES2=`$PKG_CONFIG --libs glesv2 2>/dev/null`
+ QMakeVar set QMAKE_INCDIR_OPENGL_ES2 "$QMAKE_INCDIR_OPENGL_ES2"
+ QMakeVar set QMAKE_LIBDIR_OPENGL_ES2 "$QMAKE_LIBDIR_OPENGL_ES2"
+ QMakeVar set QMAKE_LIBS_OPENGL_ES2 "$QMAKE_LIBS_OPENGL_ES2"
+ fi
+
+ "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS -I$QMAKE_INCDIR_OPENGL_ES2 $QMAKE_LIBS_OPENGL_ES2 -L$QMAKE_LIBDIR_OPENGL_ES2
if [ $? != "0" ]; then
echo "The OpenGL ES 2.0 functionality test failed!"
echo " You might need to modify the include and library search paths by editing"