summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVolker Grabsch <vog@notjusthosting.com>2009-10-06 10:17:40 (GMT)
committerVolker Grabsch <vog@notjusthosting.com>2009-10-06 10:17:40 (GMT)
commit09d2c910d821482f17a2147cd3e1133ee3370056 (patch)
tree22e57ef503d1d7ef64a9e716c21b9edec02882ef /src
parent1bd9dbd14b2e38c1e8ebb77b9818c2c8f287316e (diff)
downloadmxe-09d2c910d821482f17a2147cd3e1133ee3370056.zip
mxe-09d2c910d821482f17a2147cd3e1133ee3370056.tar.gz
mxe-09d2c910d821482f17a2147cd3e1133ee3370056.tar.bz2
add OpenGL support to package qt (by Martin Lambers)
Diffstat (limited to 'src')
-rw-r--r--src/qt-win32.patch14
-rw-r--r--src/qt.mk1
2 files changed, 14 insertions, 1 deletions
diff --git a/src/qt-win32.patch b/src/qt-win32.patch
index dfb26fb..7921674 100644
--- a/src/qt-win32.patch
+++ b/src/qt-win32.patch
@@ -1,5 +1,6 @@
Copyright (C) 2009 Mark Brand
Volker Grabsch
+ Martin Lambers
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
@@ -44,7 +45,18 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
fi
# auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
-@@ -7594,7 +7598,10 @@
+@@ -5035,7 +5039,9 @@
+ echo " You might need to modify the include and library search paths by editing"
+ echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
+ echo " ${XQMAKESPEC}."
+- exit 1
++echo NOTICE: This is a specially modifed configure script!
++echo For our purposes we do not want the OpenGL functionality test.
++# exit 1
+ fi
+ case "$PLATFORM" in
+ hpux*)
+@@ -7594,7 +7600,10 @@
[ "$IN_ROOT" = "no" ] && continue
case $a in
diff --git a/src/qt.mk b/src/qt.mk
index 0eea299..74bac38 100644
--- a/src/qt.mk
+++ b/src/qt.mk
@@ -126,6 +126,7 @@ define $(PKG)_BUILD
-plugin-sql-sqlite \
-plugin-sql-mysql \
-script \
+ -opengl desktop \
-webkit \
-phonon \
-no-phonon-backend \