diff --git a/doomsday/config.pri b/doomsday/config.pri index 4eb2676f64..22e7b08887 100644 --- a/doomsday/config.pri +++ b/doomsday/config.pri @@ -9,6 +9,7 @@ # line, as it is checked before config_user.pri is read. # # CONFIG options for Doomsday: +# - deng_32bitonly Only do a 32-bit build (no 64-bit) # - deng_aptunstable Include the unstable apt repository # - deng_nofixedasm Disable assembler fixed-point math # - deng_openal Build the OpenAL sound driver @@ -154,10 +155,18 @@ deng_nofixedasm { macx { # Select OS version. deng_snowleopard { - echo("Using Mac OS 10.6 SDK (32/64-bit Intel).") - QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.6.sdk - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 - CONFIG += x86 x86_64 + deng_32bitonly { + echo("Using Mac OS 10.6 SDK (32-bit Intel).") + QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.6.sdk + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 + CONFIG += x86 + CONFIG -= x86_64 + } else { + echo("Using Mac OS 10.6 SDK (32/64-bit Intel).") + 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 (32-bit Intel + PowerPC).") diff --git a/doomsday/dep_sdl.pri b/doomsday/dep_sdl.pri index 63125de686..56cfa51ee4 100644 --- a/doomsday/dep_sdl.pri +++ b/doomsday/dep_sdl.pri @@ -49,7 +49,7 @@ else:macx { LIBS += -framework SDL -framework SDL_mixer - !deng_snowleopard { + deng_32bitonly|!deng_snowleopard { # Also include SDL_net. INCLUDEPATH += $${SDL_FRAMEWORK_DIR}/SDL_net.framework/Headers LIBS += -framework SDL_net