summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2009-06-24 02:55:06 (GMT)
committerRhys Weatherley <rhys.weatherley@nokia.com>2009-06-24 02:55:06 (GMT)
commit871364bf2475cf3b2a9c5535b59dab41db184ef4 (patch)
tree724bacc13f16cfa236d6069cd8ae7089954e290c /configure
parent0570b26f90f031b09970f8fca1a67339b66ee33f (diff)
downloadQt-871364bf2475cf3b2a9c5535b59dab41db184ef4.zip
Qt-871364bf2475cf3b2a9c5535b59dab41db184ef4.tar.gz
Qt-871364bf2475cf3b2a9c5535b59dab41db184ef4.tar.bz2
Better detection for OpenVG engines that run on top of OpenGL
ShivaVG runs on top of OpenGL. Include the QMAKE_*_OPENGL flags on the link line if it is needed by the OpenVG engine. Reviewed-by: trustme
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure15
1 files changed, 15 insertions, 0 deletions
diff --git a/configure b/configure
index 473deef..d82c51a 100755
--- a/configure
+++ b/configure
@@ -591,6 +591,7 @@ CFG_OPENGL=auto
CFG_OPENVG=no
CFG_OPENVG_LC_INCLUDES=no
CFG_OPENVG_SHIVA=no
+CFG_OPENVG_ON_OPENGL=no
CFG_EGL=no
CFG_EGL_GLES_INCLUDES=no
CFG_SSE=auto
@@ -5550,11 +5551,22 @@ if [ "$CFG_OPENVG" != "no" ]; then
if [ "$CFG_OPENVG" = "auto" ]; then
CFG_OPENVG=yes
fi
+ elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG openvg_on_opengl" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/openvg" "OpenVG" $L_FLAGS $I_FLAGS $l_FLAGS $CONFIG_ARG; then
+ if [ "$CFG_OPENVG" = "auto" ]; then
+ CFG_OPENVG=yes
+ fi
+ CFG_OPENVG_ON_OPENGL=yes
elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG lower_case_includes" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/openvg" "OpenVG (lc includes)" $L_FLAGS $I_FLAGS $l_FLAGS $CONFIG_ARG; then
if [ "$CFG_OPENVG" = "auto" ]; then
CFG_OPENVG=yes
fi
CFG_OPENVG_LC_INCLUDES=yes
+ elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG openvg_on_opengl lower_case_includes" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/openvg" "OpenVG (lc includes)" $L_FLAGS $I_FLAGS $l_FLAGS $CONFIG_ARG; then
+ if [ "$CFG_OPENVG" = "auto" ]; then
+ CFG_OPENVG=yes
+ fi
+ CFG_OPENVG_LC_INCLUDES=yes
+ CFG_OPENVG_ON_OPENGL=yes
else
if [ "$CFG_OPENVG" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
echo "$CFG_OPENVG was specified for OpenVG but cannot be enabled due to functionality tests!"
@@ -5714,6 +5726,9 @@ else
if [ "$CFG_OPENVG_LC_INCLUDES" = "yes" ]; then
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_LOWER_CASE_VG_INCLUDES"
fi
+ if [ "$CFG_OPENVG_ON_OPENGL" = "yes" ]; then
+ QT_CONFIG="$QT_CONFIG openvg_on_opengl"
+ fi
if [ "$CFG_OPENVG_SHIVA" = "yes" ]; then
QT_CONFIG="$QT_CONFIG shivavg"
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_SHIVAVG"