From dd64a8a1d9a28dfa18f89c50954823604483777c Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 31 Dec 2011 13:29:09 -0500 Subject: [PATCH] Upgraded SDL Xcode project for XCode 4.2, including switching Framework Version to "B", which is required by the Apple Store. --- Xcode/SDL/Info-Framework.plist | 2 +- Xcode/SDL/SDL.xcodeproj/project.pbxproj | 270 ++++++------------------ 2 files changed, 67 insertions(+), 205 deletions(-) diff --git a/Xcode/SDL/Info-Framework.plist b/Xcode/SDL/Info-Framework.plist index d58a70caa..cb9748aed 100644 --- a/Xcode/SDL/Info-Framework.plist +++ b/Xcode/SDL/Info-Framework.plist @@ -19,7 +19,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.2.14 + 1.3.0 CFBundleSignature SDLX CFBundleVersion diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj index e595c2e40..cf06b7203 100755 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 44; + objectVersion = 46; objects = { /* Begin PBXAggregateTarget section */ @@ -1947,8 +1947,11 @@ /* Begin PBXProject section */ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0420; + }; buildConfigurationList = 0073178E0858DB0500B2BC32 /* Build configuration list for PBXProject "SDL" */; - compatibilityVersion = "Xcode 3.0"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -2302,122 +2305,56 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 0073177B0858DB0500B2BC32 /* Development_using_10.4SDK_and_10.6SDK */ = { - isa = XCBuildConfiguration; - buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1.3; - DYLIB_CURRENT_VERSION = 1.3.0; - FRAMEWORK_VERSION = 1.3; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(GCC_PREPROCESSOR_DEFINITIONS)", - "SDL_VIDEO_DRIVER_DGA=1", - "SDL_VIDEO_DRIVER_X11=1", - "SDL_VIDEO_DRIVER_X11_DGAMOUSE=1", - "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)", - "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)", - "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)", - "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)", - "SDL_VIDEO_DRIVER_X11_VIDMODE=1", - "SDL_VIDEO_DRIVER_X11_XINERAMA=1", - "SDL_VIDEO_DRIVER_X11_XME=1", - "SDL_VIDEO_DRIVER_X11_XRANDR=1", - "SDL_VIDEO_DRIVER_X11_XV=1", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = YES; - HEADER_SEARCH_PATHS = /usr/X11R6/include; - INFOPLIST_FILE = "Info-Framework.plist"; - INSTALL_PATH = "@executable_path/../Frameworks"; - PRODUCT_NAME = SDL; - WRAPPER_EXTENSION = framework; - }; - name = Development_using_10.4SDK_and_10.6SDK; - }; - 0073177C0858DB0500B2BC32 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */ = { + 0073177C0858DB0500B2BC32 /* Deployment_for_official_releases_using_10.6SDK */ = { isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1.3; DYLIB_CURRENT_VERSION = 1.3.0; - FRAMEWORK_VERSION = 1.3; + FRAMEWORK_VERSION = B; GCC_PREPROCESSOR_DEFINITIONS = ( "$(GCC_PREPROCESSOR_DEFINITIONS)", - "SDL_VIDEO_DRIVER_DGA=1", - "SDL_VIDEO_DRIVER_X11=1", - "SDL_VIDEO_DRIVER_X11_DGAMOUSE=1", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)", - "SDL_VIDEO_DRIVER_X11_VIDMODE=1", - "SDL_VIDEO_DRIVER_X11_XINERAMA=1", - "SDL_VIDEO_DRIVER_X11_XME=1", - "SDL_VIDEO_DRIVER_X11_XRANDR=1", - "SDL_VIDEO_DRIVER_X11_XV=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = /usr/X11R6/include; INFOPLIST_FILE = "Info-Framework.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; + OTHER_LDFLAGS = "-liconv"; PRODUCT_NAME = SDL; + SDKROOT = macosx10.6; WRAPPER_EXTENSION = framework; }; - name = Deployment_for_official_releases_using_10.4SDK_and_10.6SDK; + name = Deployment_for_official_releases_using_10.6SDK; }; 0073177D0858DB0500B2BC32 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1.3; DYLIB_CURRENT_VERSION = 1.3.0; - FRAMEWORK_VERSION = 1.3; + FRAMEWORK_VERSION = B; GCC_PREPROCESSOR_DEFINITIONS = ( "$(GCC_PREPROCESSOR_DEFINITIONS)", - "SDL_VIDEO_DRIVER_DGA=1", - "SDL_VIDEO_DRIVER_X11=1", - "SDL_VIDEO_DRIVER_X11_DGAMOUSE=1", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)", - "SDL_VIDEO_DRIVER_X11_VIDMODE=1", - "SDL_VIDEO_DRIVER_X11_XINERAMA=1", - "SDL_VIDEO_DRIVER_X11_XME=1", - "SDL_VIDEO_DRIVER_X11_XRANDR=1", - "SDL_VIDEO_DRIVER_X11_XV=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = /usr/X11R6/include; INFOPLIST_FILE = "Info-Framework.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; + OTHER_LDFLAGS = "-liconv"; PRODUCT_NAME = SDL; WRAPPER_EXTENSION = framework; }; name = Default; }; - 0073177F0858DB0500B2BC32 /* Development_using_10.4SDK_and_10.6SDK */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(GCC_PREPROCESSOR_DEFINITIONS)", - "SDL_VIDEO_DRIVER_DGA=1", - "SDL_VIDEO_DRIVER_X11=1", - "SDL_VIDEO_DRIVER_X11_DGAMOUSE=1", - "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)", - "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)", - "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)", - "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)", - "SDL_VIDEO_DRIVER_X11_VIDMODE=1", - "SDL_VIDEO_DRIVER_X11_XINERAMA=1", - "SDL_VIDEO_DRIVER_X11_XME=1", - "SDL_VIDEO_DRIVER_X11_XRANDR=1", - "SDL_VIDEO_DRIVER_X11_XV=1", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = YES; - HEADER_SEARCH_PATHS = /usr/X11R6/include; - OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))"; - PRODUCT_NAME = SDL; - }; - name = Development_using_10.4SDK_and_10.6SDK; - }; - 007317800858DB0500B2BC32 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */ = { + 007317800858DB0500B2BC32 /* Deployment_for_official_releases_using_10.6SDK */ = { isa = XCBuildConfiguration; buildSettings = { GCC_PREPROCESSOR_DEFINITIONS = ( @@ -2436,11 +2373,13 @@ "SDL_VIDEO_DRIVER_X11_XV=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = /usr/X11R6/include; OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))"; PRODUCT_NAME = SDL; + SDKROOT = macosx10.6; }; - name = Deployment_for_official_releases_using_10.4SDK_and_10.6SDK; + name = Deployment_for_official_releases_using_10.6SDK; }; 007317810858DB0500B2BC32 /* Default */ = { isa = XCBuildConfiguration; @@ -2461,81 +2400,50 @@ "SDL_VIDEO_DRIVER_X11_XV=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = /usr/X11R6/include; OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))"; PRODUCT_NAME = SDL; }; name = Default; }; - 007317870858DB0500B2BC32 /* Development_using_10.4SDK_and_10.6SDK */ = { + 007317880858DB0500B2BC32 /* Deployment_for_official_releases_using_10.6SDK */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; PRODUCT_NAME = "Standard DMG"; + SDKROOT = macosx10.6; }; - name = Development_using_10.4SDK_and_10.6SDK; - }; - 007317880858DB0500B2BC32 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "Standard DMG"; - }; - name = Deployment_for_official_releases_using_10.4SDK_and_10.6SDK; + name = Deployment_for_official_releases_using_10.6SDK; }; 007317890858DB0500B2BC32 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; PRODUCT_NAME = "Standard DMG"; }; name = Default; }; - 0073178B0858DB0500B2BC32 /* Development_using_10.4SDK_and_10.6SDK */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "Developer Extras Package"; - }; - name = Development_using_10.4SDK_and_10.6SDK; - }; - 0073178C0858DB0500B2BC32 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */ = { + 0073178C0858DB0500B2BC32 /* Deployment_for_official_releases_using_10.6SDK */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; PRODUCT_NAME = "Developer Extras Package"; }; - name = Deployment_for_official_releases_using_10.4SDK_and_10.6SDK; + name = Deployment_for_official_releases_using_10.6SDK; }; 0073178D0858DB0500B2BC32 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; PRODUCT_NAME = "Developer Extras Package"; }; name = Default; }; - 0073178F0858DB0500B2BC32 /* Development_using_10.4SDK_and_10.6SDK */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; - GCC_ALTIVEC_EXTENSIONS = YES; - GCC_AUTO_VECTORIZATION = YES; - GCC_ENABLE_CPP_EXCEPTIONS = NO; - GCC_ENABLE_CPP_RTTI = NO; - GCC_ENABLE_SSE3_EXTENSIONS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_VERSION = 4.0; - "GCC_VERSION[arch=x86_64]" = 4.2; - MACOSX_DEPLOYMENT_TARGET = 10.4; - "MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.6; - PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; - "SDKROOT[arch=x86_64]" = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk"; - WARNING_CFLAGS = ""; - }; - name = Development_using_10.4SDK_and_10.6SDK; - }; - 007317900858DB0500B2BC32 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */ = { + 007317900858DB0500B2BC32 /* Deployment_for_official_releases_using_10.6SDK */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; DEPLOYMENT_POSTPROCESSING = YES; GCC_ALTIVEC_EXTENSIONS = YES; GCC_AUTO_VECTORIZATION = YES; @@ -2547,20 +2455,18 @@ "GCC_VERSION[arch=x86_64]" = 4.2; MACOSX_DEPLOYMENT_TARGET = 10.4; "MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.6; - PREBINDING = NO; SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; "SDKROOT[arch=x86_64]" = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk"; SEPARATE_STRIP = YES; STRIP_STYLE = "non-global"; WARNING_CFLAGS = ""; }; - name = Deployment_for_official_releases_using_10.4SDK_and_10.6SDK; + name = Deployment_for_official_releases_using_10.6SDK; }; 007317910858DB0500B2BC32 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; GCC_ALTIVEC_EXTENSIONS = YES; GCC_AUTO_VECTORIZATION = YES; GCC_ENABLE_CPP_EXCEPTIONS = NO; @@ -2571,11 +2477,10 @@ GCC_VERSION_i386 = 4.0; GCC_VERSION_ppc = 4.0; GCC_VERSION_x86_64 = 4.2; - MACOSX_DEPLOYMENT_TARGET = ""; + MACOSX_DEPLOYMENT_TARGET = 10.4; MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.6; - PREBINDING = NO; SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk; SDKROOT_ppc = /Developer/SDKs/MacOSX10.4u.sdk; SDKROOT_x86_64 = /Developer/SDKs/MacOSX10.6.sdk; @@ -2584,26 +2489,20 @@ }; name = Default; }; - 008310401072EA5700A531F1 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */ = { - isa = XCBuildConfiguration; - buildSettings = { - DOXYGEN_EXE = /Applications/Doxygen.app/Contents/Resources/doxygen; - PRODUCT_NAME = "Generate Doxygen DocSet"; - }; - name = Deployment_for_official_releases_using_10.4SDK_and_10.6SDK; - }; - 008310411072EA5700A531F1 /* Development_using_10.4SDK_and_10.6SDK */ = { + 008310401072EA5700A531F1 /* Deployment_for_official_releases_using_10.6SDK */ = { isa = XCBuildConfiguration; buildSettings = { DOXYGEN_EXE = /Applications/Doxygen.app/Contents/Resources/doxygen; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; PRODUCT_NAME = "Generate Doxygen DocSet"; }; - name = Development_using_10.4SDK_and_10.6SDK; + name = Deployment_for_official_releases_using_10.6SDK; }; 008310421072EA5700A531F1 /* Development_native_only */ = { isa = XCBuildConfiguration; buildSettings = { DOXYGEN_EXE = /Applications/Doxygen.app/Contents/Resources/doxygen; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; PRODUCT_NAME = "Generate Doxygen DocSet"; }; name = Development_native_only; @@ -2612,6 +2511,7 @@ isa = XCBuildConfiguration; buildSettings = { DOXYGEN_EXE = /Applications/Doxygen.app/Contents/Resources/doxygen; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; PRODUCT_NAME = "Generate Doxygen DocSet"; }; name = Deployment_native_only; @@ -2620,6 +2520,7 @@ isa = XCBuildConfiguration; buildSettings = { DOXYGEN_EXE = /Applications/Doxygen.app/Contents/Resources/doxygen; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; PRODUCT_NAME = "Generate Doxygen DocSet"; }; name = Default; @@ -2634,8 +2535,7 @@ GCC_ENABLE_CPP_RTTI = NO; GCC_ENABLE_SSE3_EXTENSIONS = YES; GCC_OPTIMIZATION_LEVEL = 3; - MACOSX_DEPLOYMENT_TARGET = ""; - PREBINDING = NO; + MACOSX_DEPLOYMENT_TARGET = 10.4; SEPARATE_STRIP = YES; STRIP_STYLE = "non-global"; WARNING_CFLAGS = ""; @@ -2648,26 +2548,20 @@ buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1.3; DYLIB_CURRENT_VERSION = 1.3.0; - FRAMEWORK_VERSION = 1.3; + FRAMEWORK_VERSION = B; GCC_PREPROCESSOR_DEFINITIONS = ( "$(GCC_PREPROCESSOR_DEFINITIONS)", - "SDL_VIDEO_DRIVER_DGA=1", - "SDL_VIDEO_DRIVER_X11=1", - "SDL_VIDEO_DRIVER_X11_DGAMOUSE=1", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)", - "SDL_VIDEO_DRIVER_X11_VIDMODE=1", - "SDL_VIDEO_DRIVER_X11_XINERAMA=1", - "SDL_VIDEO_DRIVER_X11_XME=1", - "SDL_VIDEO_DRIVER_X11_XRANDR=1", - "SDL_VIDEO_DRIVER_X11_XV=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = /usr/X11R6/include; INFOPLIST_FILE = "Info-Framework.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; + OTHER_LDFLAGS = "-liconv"; PRODUCT_NAME = SDL; WRAPPER_EXTENSION = framework; }; @@ -2692,6 +2586,7 @@ "SDL_VIDEO_DRIVER_X11_XV=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = /usr/X11R6/include; OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))"; PRODUCT_NAME = SDL; @@ -2701,6 +2596,7 @@ 00CFA625106A567900758660 /* Deployment_native_only */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; PRODUCT_NAME = "Standard DMG"; }; name = Deployment_native_only; @@ -2708,6 +2604,7 @@ 00CFA626106A567900758660 /* Deployment_native_only */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; PRODUCT_NAME = "Developer Extras Package"; }; name = Deployment_native_only; @@ -2721,8 +2618,7 @@ GCC_ENABLE_CPP_RTTI = NO; GCC_ENABLE_SSE3_EXTENSIONS = YES; GCC_OPTIMIZATION_LEVEL = 0; - MACOSX_DEPLOYMENT_TARGET = ""; - PREBINDING = NO; + MACOSX_DEPLOYMENT_TARGET = 10.4; WARNING_CFLAGS = ""; ZERO_LINK = NO; }; @@ -2733,26 +2629,20 @@ buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1.3; DYLIB_CURRENT_VERSION = 1.3.0; - FRAMEWORK_VERSION = 1.3; + FRAMEWORK_VERSION = B; GCC_PREPROCESSOR_DEFINITIONS = ( "$(GCC_PREPROCESSOR_DEFINITIONS)", - "SDL_VIDEO_DRIVER_DGA=1", - "SDL_VIDEO_DRIVER_X11=1", - "SDL_VIDEO_DRIVER_X11_DGAMOUSE=1", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)", - "SDL_VIDEO_DRIVER_X11_VIDMODE=1", - "SDL_VIDEO_DRIVER_X11_XINERAMA=1", - "SDL_VIDEO_DRIVER_X11_XME=1", - "SDL_VIDEO_DRIVER_X11_XRANDR=1", - "SDL_VIDEO_DRIVER_X11_XV=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = /usr/X11R6/include; INFOPLIST_FILE = "Info-Framework.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; + OTHER_LDFLAGS = "-liconv"; PRODUCT_NAME = SDL; WRAPPER_EXTENSION = framework; }; @@ -2777,6 +2667,7 @@ "SDL_VIDEO_DRIVER_X11_XV=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = /usr/X11R6/include; OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))"; PRODUCT_NAME = SDL; @@ -2786,6 +2677,7 @@ 00CFA62B106A568900758660 /* Development_native_only */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; PRODUCT_NAME = "Standard DMG"; }; name = Development_native_only; @@ -2793,37 +2685,18 @@ 00CFA62C106A568900758660 /* Development_native_only */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; PRODUCT_NAME = "Developer Extras Package"; }; name = Development_native_only; }; - 00D8D9F21195090800638393 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - INFOPLIST_FILE = "testsdl-Info.plist"; - INSTALL_PATH = "$(HOME)/Applications"; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PREBINDING = NO; - PRODUCT_NAME = testsdl; - }; - name = Deployment_for_official_releases_using_10.4SDK_and_10.6SDK; - }; - 00D8D9F31195090800638393 /* Development_using_10.4SDK_and_10.6SDK */ = { + 00D8D9F21195090800638393 /* Deployment_for_official_releases_using_10.6SDK */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = NO; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; INFOPLIST_FILE = "testsdl-Info.plist"; INSTALL_PATH = "$(HOME)/Applications"; OTHER_LDFLAGS = ( @@ -2832,18 +2705,17 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = testsdl; }; - name = Development_using_10.4SDK_and_10.6SDK; + name = Deployment_for_official_releases_using_10.6SDK; }; 00D8D9F41195090800638393 /* Development_native_only */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = NO; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; INFOPLIST_FILE = "testsdl-Info.plist"; INSTALL_PATH = "$(HOME)/Applications"; OTHER_LDFLAGS = ( @@ -2852,7 +2724,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = testsdl; }; name = Development_native_only; @@ -2861,9 +2732,9 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = NO; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; INFOPLIST_FILE = "testsdl-Info.plist"; INSTALL_PATH = "$(HOME)/Applications"; OTHER_LDFLAGS = ( @@ -2872,7 +2743,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = testsdl; }; name = Deployment_native_only; @@ -2881,9 +2751,9 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = NO; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; INFOPLIST_FILE = "testsdl-Info.plist"; INSTALL_PATH = "$(HOME)/Applications"; OTHER_LDFLAGS = ( @@ -2892,7 +2762,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = testsdl; }; name = Default; @@ -2903,8 +2772,7 @@ 0073177A0858DB0500B2BC32 /* Build configuration list for PBXNativeTarget "Framework" */ = { isa = XCConfigurationList; buildConfigurations = ( - 0073177C0858DB0500B2BC32 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */, - 0073177B0858DB0500B2BC32 /* Development_using_10.4SDK_and_10.6SDK */, + 0073177C0858DB0500B2BC32 /* Deployment_for_official_releases_using_10.6SDK */, 00CFA628106A568900758660 /* Development_native_only */, 00CFA622106A567900758660 /* Deployment_native_only */, 0073177D0858DB0500B2BC32 /* Default */, @@ -2915,8 +2783,7 @@ 0073177E0858DB0500B2BC32 /* Build configuration list for PBXNativeTarget "Static Library" */ = { isa = XCConfigurationList; buildConfigurations = ( - 007317800858DB0500B2BC32 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */, - 0073177F0858DB0500B2BC32 /* Development_using_10.4SDK_and_10.6SDK */, + 007317800858DB0500B2BC32 /* Deployment_for_official_releases_using_10.6SDK */, 00CFA629106A568900758660 /* Development_native_only */, 00CFA623106A567900758660 /* Deployment_native_only */, 007317810858DB0500B2BC32 /* Default */, @@ -2927,8 +2794,7 @@ 007317860858DB0500B2BC32 /* Build configuration list for PBXNativeTarget "Standard DMG" */ = { isa = XCConfigurationList; buildConfigurations = ( - 007317880858DB0500B2BC32 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */, - 007317870858DB0500B2BC32 /* Development_using_10.4SDK_and_10.6SDK */, + 007317880858DB0500B2BC32 /* Deployment_for_official_releases_using_10.6SDK */, 00CFA62B106A568900758660 /* Development_native_only */, 00CFA625106A567900758660 /* Deployment_native_only */, 007317890858DB0500B2BC32 /* Default */, @@ -2939,8 +2805,7 @@ 0073178A0858DB0500B2BC32 /* Build configuration list for PBXNativeTarget "Developer Extras Package" */ = { isa = XCConfigurationList; buildConfigurations = ( - 0073178C0858DB0500B2BC32 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */, - 0073178B0858DB0500B2BC32 /* Development_using_10.4SDK_and_10.6SDK */, + 0073178C0858DB0500B2BC32 /* Deployment_for_official_releases_using_10.6SDK */, 00CFA62C106A568900758660 /* Development_native_only */, 00CFA626106A567900758660 /* Deployment_native_only */, 0073178D0858DB0500B2BC32 /* Default */, @@ -2951,8 +2816,7 @@ 0073178E0858DB0500B2BC32 /* Build configuration list for PBXProject "SDL" */ = { isa = XCConfigurationList; buildConfigurations = ( - 007317900858DB0500B2BC32 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */, - 0073178F0858DB0500B2BC32 /* Development_using_10.4SDK_and_10.6SDK */, + 007317900858DB0500B2BC32 /* Deployment_for_official_releases_using_10.6SDK */, 00CFA627106A568900758660 /* Development_native_only */, 00CFA621106A567900758660 /* Deployment_native_only */, 007317910858DB0500B2BC32 /* Default */, @@ -2963,8 +2827,7 @@ 008310471072EAAE00A531F1 /* Build configuration list for PBXAggregateTarget "Generate Doxygen DocSet" */ = { isa = XCConfigurationList; buildConfigurations = ( - 008310401072EA5700A531F1 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */, - 008310411072EA5700A531F1 /* Development_using_10.4SDK_and_10.6SDK */, + 008310401072EA5700A531F1 /* Deployment_for_official_releases_using_10.6SDK */, 008310421072EA5700A531F1 /* Development_native_only */, 008310431072EA5700A531F1 /* Deployment_native_only */, 008310441072EA5700A531F1 /* Default */, @@ -2975,8 +2838,7 @@ 00D8D9F71195090900638393 /* Build configuration list for PBXNativeTarget "testsdl" */ = { isa = XCConfigurationList; buildConfigurations = ( - 00D8D9F21195090800638393 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */, - 00D8D9F31195090800638393 /* Development_using_10.4SDK_and_10.6SDK */, + 00D8D9F21195090800638393 /* Deployment_for_official_releases_using_10.6SDK */, 00D8D9F41195090800638393 /* Development_native_only */, 00D8D9F51195090800638393 /* Deployment_native_only */, 00D8D9F61195090800638393 /* Default */,