g15helper, macx/compat: fix OS X i386 targetting when using Qt 5.

mumble-voip · Jul 31, 2014 · 19996c5 · 19996c5
1 parent c0d7aad
commit 19996c5
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/g15helper/g15helper.pro b/g15helper/g15helper.pro
@@ -19,8 +19,16 @@ win32 {
 }
 
 macx {
-  CONFIG -= app_bundle x86_64
-  CONFIG += x86
+  CONFIG -= app_bundle
+  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
+  }
   SOURCES = g15helper_macx.c
   LIBS *= -llgLcd
   QMAKE_LIBDIR *= $$(MUMBLE_PREFIX)/../LCDSDK/lib/

diff --git 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
 }