From d1b3e7c4a3b84637406a1a33111caa3f9043bba5 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Fri, 10 Oct 2014 06:01:29 +0000 Subject: [PATCH] Xcode project: adjust settings for debug variants of targets: use default SDK rather than 10.6, native architecture rather than x86_64 + i386, and the default compiler instead of llvm-gcc4.2 This should make the project build out of the box on a wider variety of systems (i.e. without needing the 10.6 sdk) git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1095 af15c1b1-3010-417e-b628-4374ebc0bcbd --- MacOSX/QuakeSpasm.xcodeproj/project.pbxproj | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj b/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj index 6e6a6d1c..5b425847 100644 --- a/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj +++ b/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj @@ -1088,10 +1088,7 @@ 664D98F719CF6B78000D395C /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - x86_64, - i386, - ); + ARCHS = "$(NATIVE_ARCH_ACTUAL)"; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1106,7 +1103,7 @@ USE_SDL2, SDL_FRAMEWORK, ); - GCC_VERSION = com.apple.compilers.llvmgcc42; + GCC_VERSION = ""; HEADER_SEARCH_PATHS = ( codecs/include, "$(HEADER_SEARCH_PATHS)", @@ -1120,7 +1117,7 @@ ); "MACOSX_DEPLOYMENT_TARGET[arch=i386]" = 10.5; PRODUCT_NAME = QuakeSpasm; - SDKROOT = macosx10.6; + SDKROOT = macosx; WRAPPER_EXTENSION = app; ZERO_LINK = YES; }; @@ -1191,10 +1188,7 @@ C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - x86_64, - i386, - ); + ARCHS = "$(NATIVE_ARCH_ACTUAL)"; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1206,7 +1200,7 @@ GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = SDL_FRAMEWORK; - GCC_VERSION = com.apple.compilers.llvmgcc42; + GCC_VERSION = ""; HEADER_SEARCH_PATHS = ( codecs/include, "$(HEADER_SEARCH_PATHS)", @@ -1219,7 +1213,7 @@ "\"$(SRCROOT)/codecs/lib\"", ); PRODUCT_NAME = QuakeSpasm; - SDKROOT = macosx10.6; + SDKROOT = macosx; WRAPPER_EXTENSION = app; ZERO_LINK = YES; };