From 273c024aec73869d44249820b72ac7fcc3293569 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Tue, 27 Dec 2011 17:03:59 -0700 Subject: [PATCH] xcode crap --- MacOSX/QuakeSpasm.xcodeproj/project.pbxproj | 86 +------------------ .../xcschemes/QuakeSpasm.xcscheme | 2 +- .../xcschemes/xcschememanagement.plist | 15 ++++ 3 files changed, 18 insertions(+), 85 deletions(-) diff --git a/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj b/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj index 49f22bba..864d3288 100644 --- a/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj +++ b/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj @@ -868,10 +868,6 @@ 48A7C1F214A9E5000011B754 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - x86_64, - i386, - ); COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -895,7 +891,6 @@ "\"$(SRCROOT)\"", ); PRODUCT_NAME = "QuakeSpasm copy"; - SDKROOT = macosx10.5; WRAPPER_EXTENSION = app; ZERO_LINK = YES; }; @@ -904,11 +899,6 @@ 48A7C1F314A9E5000011B754 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - x86_64, - i386, - ppc, - ); FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", @@ -952,7 +942,6 @@ ppc, ); PRODUCT_NAME = "QuakeSpasm copy"; - SDKROOT = macosx10.5; WRAPPER_EXTENSION = app; }; name = Release; @@ -960,19 +949,12 @@ C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - x86_64, - i386, - ); - COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", ); - FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\""; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = USE_QS_CONBACK; HEADER_SEARCH_PATHS = ( @@ -987,27 +969,18 @@ "\"$(SRCROOT)\"", ); PRODUCT_NAME = QuakeSpasm; - SDKROOT = macosx10.5; WRAPPER_EXTENSION = app; - ZERO_LINK = YES; }; name = Debug; }; C01FCF4C08A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - x86_64, - i386, - ppc, - ); FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", ); - FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; GCC_PREPROCESSOR_DEFINITIONS = ( USE_CODEC_MP3, USE_CODEC_VORBIS, @@ -1034,17 +1007,7 @@ "-arch", ppc, ); - OTHER_LDFLAGS = ""; - "OTHER_LDFLAGS[arch=ppc64]" = ( - "-arch", - ppc, - ); - "OTHER_LDFLAGS[arch=ppc]" = ( - "-arch", - ppc, - ); PRODUCT_NAME = QuakeSpasm; - SDKROOT = macosx10.5; WRAPPER_EXTENSION = app; }; name = Release; @@ -1052,17 +1015,13 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - x86_64, - i386, - ); + ARCHS = "$(NATIVE_ARCH_ACTUAL)"; FRAMEWORK_SEARCH_PATHS = ( /Library/Frameworks, "$(FRAMEWORK_SEARCH_PATHS)", ); GCC_MODEL_TUNING = G3; GCC_PREPROCESSOR_DEFINITIONS = USE_QS_CONBACK; - GCC_VERSION = 4.0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( @@ -1070,26 +1029,14 @@ "$(HEADER_SEARCH_PATHS)", ); LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.4; - "MACOSX_DEPLOYMENT_TARGET[arch=i386]" = 10.4; - "MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.5; - ONLY_ACTIVE_ARCH = NO; PREBINDING = NO; - SDKROOT = macosx10.5; - "SDKROOT[arch=i386]" = macosx10.4; - "SDKROOT[arch=x86_64]" = macosx10.5; - VALID_ARCHS = "i386 x86_64"; }; name = Debug; }; C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - x86_64, - i386, - ppc, - ); + ARCHS = "$(NATIVE_ARCH_ACTUAL)"; FRAMEWORK_SEARCH_PATHS = ( /Library/Frameworks, "$(FRAMEWORK_SEARCH_PATHS)", @@ -1101,7 +1048,6 @@ USE_CODEC_WAVE, USE_QS_CONBACK, ); - GCC_VERSION = 4.0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( @@ -1110,35 +1056,7 @@ "$(HEADER_SEARCH_PATHS)", ); LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.4; - "MACOSX_DEPLOYMENT_TARGET[arch=i386]" = 10.4; - "MACOSX_DEPLOYMENT_TARGET[arch=ppc]" = 10.4; - "MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.5; - ONLY_ACTIVE_ARCH = NO; - OTHER_CFLAGS = ""; - "OTHER_CFLAGS[arch=ppc64]" = ( - "-arch", - ppc, - ); - "OTHER_CFLAGS[arch=ppc]" = ( - "-arch", - ppc, - ); - OTHER_LDFLAGS = ""; - "OTHER_LDFLAGS[arch=ppc64]" = ( - "-arch", - ppc, - ); - "OTHER_LDFLAGS[arch=ppc]" = ( - "-arch", - ppc, - ); PREBINDING = NO; - SDKROOT = macosx10.5; - "SDKROOT[arch=i386]" = macosx10.4; - "SDKROOT[arch=ppc]" = macosx10.4; - "SDKROOT[arch=x86_64]" = macosx10.5; - VALID_ARCHS = "i386 x86_64 ppc ppc64 ppc7400 ppc970"; }; name = Release; }; diff --git a/MacOSX/QuakeSpasm.xcodeproj/xcshareddata/xcschemes/QuakeSpasm.xcscheme b/MacOSX/QuakeSpasm.xcodeproj/xcshareddata/xcschemes/QuakeSpasm.xcscheme index 888c9155..5ea21708 100644 --- a/MacOSX/QuakeSpasm.xcodeproj/xcshareddata/xcschemes/QuakeSpasm.xcscheme +++ b/MacOSX/QuakeSpasm.xcodeproj/xcshareddata/xcschemes/QuakeSpasm.xcscheme @@ -59,7 +59,7 @@ + isEnabled = "NO"> orderHint 1 + QuakeSpasm Release.xcscheme + + orderHint + 3 + QuakeSpasm.xcscheme orderHint 0 + QuakeSpasm.xcscheme_^#shared#^_ + + orderHint + 2 + SuppressBuildableAutocreation + 48A7C18B14A9E5000011B754 + + primary + + 48ADEC8E1243D946000AF19C primary