summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2010-10-02 13:09:49 (GMT)
committerTony Theodore <tonyt@logyst.com>2010-10-02 13:09:49 (GMT)
commite82240baa7dd6dd1c2067bc0c05f6820219a842e (patch)
treeddf27c748f87a5b55d207d57330d9bb2a60c9496
parentca610a8b7f93856e0114fc965ecb17135f42f98d (diff)
downloadmxe-e82240baa7dd6dd1c2067bc0c05f6820219a842e.zip
mxe-e82240baa7dd6dd1c2067bc0c05f6820219a842e.tar.gz
mxe-e82240baa7dd6dd1c2067bc0c05f6820219a842e.tar.bz2
bugfix for qt on macx-g++: native build complains about 64-bit app with 32-bit version
-rw-r--r--src/qt-2-macosx-gcc-arch.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/src/qt-2-macosx-gcc-arch.patch b/src/qt-2-macosx-gcc-arch.patch
new file mode 100644
index 0000000..5f52916
--- /dev/null
+++ b/src/qt-2-macosx-gcc-arch.patch
@@ -0,0 +1,20 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+The native build complains about:
+
+"You are building a 64-bit application, but using a 32-bit version of Qt. Check your build configuration."
+
+diff -ur a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf
+--- a/mkspecs/macx-g++/qmake.conf 2010-09-26 23:32:05.000000000 +1000
++++ b/mkspecs/macx-g++/qmake.conf 2010-09-26 23:31:29.000000000 +1000
+@@ -13,8 +13,8 @@
+ QT += core gui
+ QMAKE_INCREMENTAL_STYLE = sublib
+
+-QMAKE_CC = gcc
+-QMAKE_CXX = g++
++QMAKE_CC = gcc -arch i386
++QMAKE_CXX = g++ -arch i386
+
+ include(../common/mac-g++.conf)