qmake: Adjustments for 10.4u build

skyjake · Sep 19, 2011 · 4f9b8f8 · 4f9b8f8
1 parent 61156c6
commit 4f9b8f8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/distrib/platform_release.py b/distrib/platform_release.py
@@ -85,7 +85,8 @@ def mac_release():
     os.chdir(WORK_DIR)
     mkdir('release_build')
     os.chdir('release_build')
-    if os.system('cmake -D DOOMSDAY_BUILD_TEXT="' + DOOMSDAY_BUILD_NUMBER + '" -D MACOS_VERSION=' + mac_os_version() + ' ' + DOOMSDAY_DIR + ' && make'):
+    #if os.system('cmake -D DOOMSDAY_BUILD_TEXT="' + DOOMSDAY_BUILD_NUMBER + '" -D MACOS_VERSION=' + mac_os_version() + ' ' + DOOMSDAY_DIR + ' && make'):
+    if os.system('qmake -r -spec macx-g++ CONFIG+=release DENG_BUILD=%s ../../../doomsday/doomsday.pro && make && make install' % (DOOMSDAY_BUILD_NUMBER)):
         raise Exception("Failed to build from source.")
 
     # Now we can proceed to packaging.

diff --git a/doomsday/config.pri b/doomsday/config.pri
@@ -119,20 +119,6 @@ macx {
     DEFINES += MACOSX
 
     QMAKE_LFLAGS += -flat_namespace -undefined suppress
-
-    # Select OS version.
-    deng_snowleopard {
-        echo("Using Mac OS 10.6 SDK (Universal 32/64-bit, no PowerPC binary).")
-        QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.6.sdk
-        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
-        CONFIG += x86 x86_64
-    }
-    else {
-        echo("Using Mac OS 10.4 SDK (Universal 32-bit Intel/PowerPC binary.)")
-        QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk
-        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
-        CONFIG += x86 ppc
-    }
 }
 
 # Options defined by the user (may not exist).
@@ -148,3 +134,18 @@ deng_nofixedasm {
 !deng_rangecheck {
     DEFINES += NORANGECHECKING
 }
+macx {
+    # Select OS version.
+    deng_snowleopard {
+        echo("Using Mac OS 10.6 SDK (Universal 32/64-bit, no PowerPC binary).")
+        QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.6.sdk
+        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
+        CONFIG += x86 x86_64
+    }
+    else {
+        echo("Using Mac OS 10.4 SDK (Universal 32-bit Intel/PowerPC binary.)")
+        QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk
+        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
+        CONFIG += x86 ppc
+    }
+}