Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/macx
diff options
context:
space:
mode:
authorMikkel Krautz <mikkel@krautz.dk>2014-08-01 02:00:10 +0400
committerMikkel Krautz <mikkel@krautz.dk>2014-08-01 02:01:45 +0400
commit19996c5351013c9f5bd213a2284de49728d4025a (patch)
tree4bbad3de31b4b894480834bf76b73aedd477c5ca /macx
parentc0d7aad0691f4f7aa826bfaffc72cfe968d74dd4 (diff)
g15helper, macx/compat: fix OS X i386 targetting when using Qt 5.
Diffstat (limited to 'macx')
-rw-r--r--macx/compat/compat.pro15
1 files changed, 13 insertions, 2 deletions
diff --git a/macx/compat/compat.pro b/macx/compat/compat.pro
index baf799968..d5050df22 100644
--- a/macx/compat/compat.pro
+++ b/macx/compat/compat.pro
@@ -5,8 +5,19 @@ include(../../compiler.pri)
include(../common.pri)
TEMPLATE = app
-CONFIG -= qt app_bundle x86_64
-CONFIG += debug_and_release x86
+CONFIG -= qt app_bundle
+CONFIG += debug_and_release
+
+isEqual(QT_MAJOR_VERSION, 5) {
+ QMAKE_CFLAGS += -arch i386
+ QMAKE_OBJECTIVE_CFLAGS += -arch i386
+ QMAKE_CXXFLAGS += -arch i386
+ QMAKE_LFLAGS += -arch i386
+} else {
+ CONFIG -= x86_64
+ CONFIG += x86
+}
+
CONFIG(universal) {
CONFIG += ppc
}