Mercurial > mxe-octave
changeset 491:1503cb754dde
disable a disturbing build mechanism which is unnecessary when cross compiling in package qt
| author | Volker Grabsch <vog@notjusthosting.com> |
|---|---|
| date | Sat, 10 Oct 2009 22:46:11 +0200 |
| parents | 37aaaccba134 |
| children | ff771e8ed553 |
| files | src/qt-win32.patch |
| diffstat | 1 files changed, 20 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/qt-win32.patch Sat Oct 10 15:41:03 2009 +0200 +++ b/src/qt-win32.patch Sat Oct 10 22:46:11 2009 +0200 @@ -43,7 +43,7 @@ fi # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x) -@@ -5035,7 +5039,9 @@ +@@ -5035,7 +5037,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}." @@ -54,7 +54,25 @@ fi case "$PLATFORM" in hpux*) -@@ -7594,7 +7600,11 @@ +@@ -6087,11 +6091,12 @@ + QT_CONFIG="$QT_CONFIG freetype" + fi + +-if [ "x$PLATFORM_MAC" = "xyes" ]; then +- #On Mac we implicitly link against libz, so we +- #never use the 3rdparty stuff. +- [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system" +-fi ++# We're cross compiling, so we respect the user setting. ++#if [ "x$PLATFORM_MAC" = "xyes" ]; then ++# #On Mac we implicitly link against libz, so we ++# #never use the 3rdparty stuff. ++# [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system" ++#fi + if [ "$CFG_ZLIB" = "yes" ]; then + QT_CONFIG="$QT_CONFIG zlib" + elif [ "$CFG_ZLIB" = "system" ]; then +@@ -7594,7 +7599,11 @@ [ "$IN_ROOT" = "no" ] && continue case $a in