Upgraded SDL Xcode project for XCode 4.2, including switching Framework Version to "B", which is required by the Apple Store.
authorSam Lantinga <slouken@libsdl.org>
Sat, 31 Dec 2011 13:29:09 -0500
changeset 614067268d47c17b
parent 6139 06710207a491
child 6145 964d13f789e2
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
Xcode/SDL/SDL.xcodeproj/project.pbxproj
     1.1 --- a/Xcode/SDL/Info-Framework.plist	Sat Dec 31 13:28:07 2011 -0500
     1.2 +++ b/Xcode/SDL/Info-Framework.plist	Sat Dec 31 13:29:09 2011 -0500
     1.3 @@ -19,7 +19,7 @@
     1.4  	<key>CFBundlePackageType</key>
     1.5  	<string>FMWK</string>
     1.6  	<key>CFBundleShortVersionString</key>
     1.7 -	<string>1.2.14</string>
     1.8 +	<string>1.3.0</string>
     1.9  	<key>CFBundleSignature</key>
    1.10  	<string>SDLX</string>
    1.11  	<key>CFBundleVersion</key>
     2.1 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Sat Dec 31 13:28:07 2011 -0500
     2.2 +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Sat Dec 31 13:29:09 2011 -0500
     2.3 @@ -3,7 +3,7 @@
     2.4  	archiveVersion = 1;
     2.5  	classes = {
     2.6  	};
     2.7 -	objectVersion = 44;
     2.8 +	objectVersion = 46;
     2.9  	objects = {
    2.10  
    2.11  /* Begin PBXAggregateTarget section */
    2.12 @@ -1947,8 +1947,11 @@
    2.13  /* Begin PBXProject section */
    2.14  		0867D690FE84028FC02AAC07 /* Project object */ = {
    2.15  			isa = PBXProject;
    2.16 +			attributes = {
    2.17 +				LastUpgradeCheck = 0420;
    2.18 +			};
    2.19  			buildConfigurationList = 0073178E0858DB0500B2BC32 /* Build configuration list for PBXProject "SDL" */;
    2.20 -			compatibilityVersion = "Xcode 3.0";
    2.21 +			compatibilityVersion = "Xcode 3.2";
    2.22  			developmentRegion = English;
    2.23  			hasScannedForEncodings = 1;
    2.24  			knownRegions = (
    2.25 @@ -2302,97 +2305,56 @@
    2.26  /* End PBXTargetDependency section */
    2.27  
    2.28  /* Begin XCBuildConfiguration section */
    2.29 -		0073177B0858DB0500B2BC32 /* Development_using_10.4SDK_and_10.6SDK */ = {
    2.30 +		0073177C0858DB0500B2BC32 /* Deployment_for_official_releases_using_10.6SDK */ = {
    2.31  			isa = XCBuildConfiguration;
    2.32  			buildSettings = {
    2.33  				DYLIB_COMPATIBILITY_VERSION = 1.3;
    2.34  				DYLIB_CURRENT_VERSION = 1.3.0;
    2.35 -				FRAMEWORK_VERSION = 1.3;
    2.36 +				FRAMEWORK_VERSION = B;
    2.37  				GCC_PREPROCESSOR_DEFINITIONS = (
    2.38  					"$(GCC_PREPROCESSOR_DEFINITIONS)",
    2.39 -					"SDL_VIDEO_DRIVER_DGA=1",
    2.40 -					"SDL_VIDEO_DRIVER_X11=1",
    2.41 -					"SDL_VIDEO_DRIVER_X11_DGAMOUSE=1",
    2.42  					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)",
    2.43  					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)",
    2.44  					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)",
    2.45  					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)",
    2.46 -					"SDL_VIDEO_DRIVER_X11_VIDMODE=1",
    2.47 -					"SDL_VIDEO_DRIVER_X11_XINERAMA=1",
    2.48 -					"SDL_VIDEO_DRIVER_X11_XME=1",
    2.49 -					"SDL_VIDEO_DRIVER_X11_XRANDR=1",
    2.50 -					"SDL_VIDEO_DRIVER_X11_XV=1",
    2.51  				);
    2.52  				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
    2.53 +				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
    2.54  				HEADER_SEARCH_PATHS = /usr/X11R6/include;
    2.55  				INFOPLIST_FILE = "Info-Framework.plist";
    2.56  				INSTALL_PATH = "@executable_path/../Frameworks";
    2.57 +				OTHER_LDFLAGS = "-liconv";
    2.58  				PRODUCT_NAME = SDL;
    2.59 +				SDKROOT = macosx10.6;
    2.60  				WRAPPER_EXTENSION = framework;
    2.61  			};
    2.62 -			name = Development_using_10.4SDK_and_10.6SDK;
    2.63 -		};
    2.64 -		0073177C0858DB0500B2BC32 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */ = {
    2.65 -			isa = XCBuildConfiguration;
    2.66 -			buildSettings = {
    2.67 -				DYLIB_COMPATIBILITY_VERSION = 1.3;
    2.68 -				DYLIB_CURRENT_VERSION = 1.3.0;
    2.69 -				FRAMEWORK_VERSION = 1.3;
    2.70 -				GCC_PREPROCESSOR_DEFINITIONS = (
    2.71 -					"$(GCC_PREPROCESSOR_DEFINITIONS)",
    2.72 -					"SDL_VIDEO_DRIVER_DGA=1",
    2.73 -					"SDL_VIDEO_DRIVER_X11=1",
    2.74 -					"SDL_VIDEO_DRIVER_X11_DGAMOUSE=1",
    2.75 -					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)",
    2.76 -					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)",
    2.77 -					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)",
    2.78 -					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)",
    2.79 -					"SDL_VIDEO_DRIVER_X11_VIDMODE=1",
    2.80 -					"SDL_VIDEO_DRIVER_X11_XINERAMA=1",
    2.81 -					"SDL_VIDEO_DRIVER_X11_XME=1",
    2.82 -					"SDL_VIDEO_DRIVER_X11_XRANDR=1",
    2.83 -					"SDL_VIDEO_DRIVER_X11_XV=1",
    2.84 -				);
    2.85 -				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
    2.86 -				HEADER_SEARCH_PATHS = /usr/X11R6/include;
    2.87 -				INFOPLIST_FILE = "Info-Framework.plist";
    2.88 -				INSTALL_PATH = "@executable_path/../Frameworks";
    2.89 -				PRODUCT_NAME = SDL;
    2.90 -				WRAPPER_EXTENSION = framework;
    2.91 -			};
    2.92 -			name = Deployment_for_official_releases_using_10.4SDK_and_10.6SDK;
    2.93 +			name = Deployment_for_official_releases_using_10.6SDK;
    2.94  		};
    2.95  		0073177D0858DB0500B2BC32 /* Default */ = {
    2.96  			isa = XCBuildConfiguration;
    2.97  			buildSettings = {
    2.98  				DYLIB_COMPATIBILITY_VERSION = 1.3;
    2.99  				DYLIB_CURRENT_VERSION = 1.3.0;
   2.100 -				FRAMEWORK_VERSION = 1.3;
   2.101 +				FRAMEWORK_VERSION = B;
   2.102  				GCC_PREPROCESSOR_DEFINITIONS = (
   2.103  					"$(GCC_PREPROCESSOR_DEFINITIONS)",
   2.104 -					"SDL_VIDEO_DRIVER_DGA=1",
   2.105 -					"SDL_VIDEO_DRIVER_X11=1",
   2.106 -					"SDL_VIDEO_DRIVER_X11_DGAMOUSE=1",
   2.107  					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)",
   2.108  					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)",
   2.109  					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)",
   2.110  					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)",
   2.111 -					"SDL_VIDEO_DRIVER_X11_VIDMODE=1",
   2.112 -					"SDL_VIDEO_DRIVER_X11_XINERAMA=1",
   2.113 -					"SDL_VIDEO_DRIVER_X11_XME=1",
   2.114 -					"SDL_VIDEO_DRIVER_X11_XRANDR=1",
   2.115 -					"SDL_VIDEO_DRIVER_X11_XV=1",
   2.116  				);
   2.117  				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
   2.118 +				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.119  				HEADER_SEARCH_PATHS = /usr/X11R6/include;
   2.120  				INFOPLIST_FILE = "Info-Framework.plist";
   2.121  				INSTALL_PATH = "@executable_path/../Frameworks";
   2.122 +				OTHER_LDFLAGS = "-liconv";
   2.123  				PRODUCT_NAME = SDL;
   2.124  				WRAPPER_EXTENSION = framework;
   2.125  			};
   2.126  			name = Default;
   2.127  		};
   2.128 -		0073177F0858DB0500B2BC32 /* Development_using_10.4SDK_and_10.6SDK */ = {
   2.129 +		007317800858DB0500B2BC32 /* Deployment_for_official_releases_using_10.6SDK */ = {
   2.130  			isa = XCBuildConfiguration;
   2.131  			buildSettings = {
   2.132  				GCC_PREPROCESSOR_DEFINITIONS = (
   2.133 @@ -2411,36 +2373,13 @@
   2.134  					"SDL_VIDEO_DRIVER_X11_XV=1",
   2.135  				);
   2.136  				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
   2.137 +				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.138  				HEADER_SEARCH_PATHS = /usr/X11R6/include;
   2.139  				OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))";
   2.140  				PRODUCT_NAME = SDL;
   2.141 +				SDKROOT = macosx10.6;
   2.142  			};
   2.143 -			name = Development_using_10.4SDK_and_10.6SDK;
   2.144 -		};
   2.145 -		007317800858DB0500B2BC32 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */ = {
   2.146 -			isa = XCBuildConfiguration;
   2.147 -			buildSettings = {
   2.148 -				GCC_PREPROCESSOR_DEFINITIONS = (
   2.149 -					"$(GCC_PREPROCESSOR_DEFINITIONS)",
   2.150 -					"SDL_VIDEO_DRIVER_DGA=1",
   2.151 -					"SDL_VIDEO_DRIVER_X11=1",
   2.152 -					"SDL_VIDEO_DRIVER_X11_DGAMOUSE=1",
   2.153 -					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)",
   2.154 -					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)",
   2.155 -					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)",
   2.156 -					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)",
   2.157 -					"SDL_VIDEO_DRIVER_X11_VIDMODE=1",
   2.158 -					"SDL_VIDEO_DRIVER_X11_XINERAMA=1",
   2.159 -					"SDL_VIDEO_DRIVER_X11_XME=1",
   2.160 -					"SDL_VIDEO_DRIVER_X11_XRANDR=1",
   2.161 -					"SDL_VIDEO_DRIVER_X11_XV=1",
   2.162 -				);
   2.163 -				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
   2.164 -				HEADER_SEARCH_PATHS = /usr/X11R6/include;
   2.165 -				OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))";
   2.166 -				PRODUCT_NAME = SDL;
   2.167 -			};
   2.168 -			name = Deployment_for_official_releases_using_10.4SDK_and_10.6SDK;
   2.169 +			name = Deployment_for_official_releases_using_10.6SDK;
   2.170  		};
   2.171  		007317810858DB0500B2BC32 /* Default */ = {
   2.172  			isa = XCBuildConfiguration;
   2.173 @@ -2461,81 +2400,50 @@
   2.174  					"SDL_VIDEO_DRIVER_X11_XV=1",
   2.175  				);
   2.176  				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
   2.177 +				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.178  				HEADER_SEARCH_PATHS = /usr/X11R6/include;
   2.179  				OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))";
   2.180  				PRODUCT_NAME = SDL;
   2.181  			};
   2.182  			name = Default;
   2.183  		};
   2.184 -		007317870858DB0500B2BC32 /* Development_using_10.4SDK_and_10.6SDK */ = {
   2.185 +		007317880858DB0500B2BC32 /* Deployment_for_official_releases_using_10.6SDK */ = {
   2.186  			isa = XCBuildConfiguration;
   2.187  			buildSettings = {
   2.188 +				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.189  				PRODUCT_NAME = "Standard DMG";
   2.190 +				SDKROOT = macosx10.6;
   2.191  			};
   2.192 -			name = Development_using_10.4SDK_and_10.6SDK;
   2.193 -		};
   2.194 -		007317880858DB0500B2BC32 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */ = {
   2.195 -			isa = XCBuildConfiguration;
   2.196 -			buildSettings = {
   2.197 -				PRODUCT_NAME = "Standard DMG";
   2.198 -			};
   2.199 -			name = Deployment_for_official_releases_using_10.4SDK_and_10.6SDK;
   2.200 +			name = Deployment_for_official_releases_using_10.6SDK;
   2.201  		};
   2.202  		007317890858DB0500B2BC32 /* Default */ = {
   2.203  			isa = XCBuildConfiguration;
   2.204  			buildSettings = {
   2.205 +				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.206  				PRODUCT_NAME = "Standard DMG";
   2.207  			};
   2.208  			name = Default;
   2.209  		};
   2.210 -		0073178B0858DB0500B2BC32 /* Development_using_10.4SDK_and_10.6SDK */ = {
   2.211 +		0073178C0858DB0500B2BC32 /* Deployment_for_official_releases_using_10.6SDK */ = {
   2.212  			isa = XCBuildConfiguration;
   2.213  			buildSettings = {
   2.214 +				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.215  				PRODUCT_NAME = "Developer Extras Package";
   2.216  			};
   2.217 -			name = Development_using_10.4SDK_and_10.6SDK;
   2.218 -		};
   2.219 -		0073178C0858DB0500B2BC32 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */ = {
   2.220 -			isa = XCBuildConfiguration;
   2.221 -			buildSettings = {
   2.222 -				PRODUCT_NAME = "Developer Extras Package";
   2.223 -			};
   2.224 -			name = Deployment_for_official_releases_using_10.4SDK_and_10.6SDK;
   2.225 +			name = Deployment_for_official_releases_using_10.6SDK;
   2.226  		};
   2.227  		0073178D0858DB0500B2BC32 /* Default */ = {
   2.228  			isa = XCBuildConfiguration;
   2.229  			buildSettings = {
   2.230 +				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.231  				PRODUCT_NAME = "Developer Extras Package";
   2.232  			};
   2.233  			name = Default;
   2.234  		};
   2.235 -		0073178F0858DB0500B2BC32 /* Development_using_10.4SDK_and_10.6SDK */ = {
   2.236 +		007317900858DB0500B2BC32 /* Deployment_for_official_releases_using_10.6SDK */ = {
   2.237  			isa = XCBuildConfiguration;
   2.238  			buildSettings = {
   2.239 -				ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
   2.240 -				ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
   2.241 -				GCC_ALTIVEC_EXTENSIONS = YES;
   2.242 -				GCC_AUTO_VECTORIZATION = YES;
   2.243 -				GCC_ENABLE_CPP_EXCEPTIONS = NO;
   2.244 -				GCC_ENABLE_CPP_RTTI = NO;
   2.245 -				GCC_ENABLE_SSE3_EXTENSIONS = YES;
   2.246 -				GCC_OPTIMIZATION_LEVEL = 0;
   2.247 -				GCC_VERSION = 4.0;
   2.248 -				"GCC_VERSION[arch=x86_64]" = 4.2;
   2.249 -				MACOSX_DEPLOYMENT_TARGET = 10.4;
   2.250 -				"MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.6;
   2.251 -				PREBINDING = NO;
   2.252 -				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
   2.253 -				"SDKROOT[arch=x86_64]" = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";
   2.254 -				WARNING_CFLAGS = "";
   2.255 -			};
   2.256 -			name = Development_using_10.4SDK_and_10.6SDK;
   2.257 -		};
   2.258 -		007317900858DB0500B2BC32 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */ = {
   2.259 -			isa = XCBuildConfiguration;
   2.260 -			buildSettings = {
   2.261 -				ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
   2.262 -				ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
   2.263 +				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
   2.264  				DEPLOYMENT_POSTPROCESSING = YES;
   2.265  				GCC_ALTIVEC_EXTENSIONS = YES;
   2.266  				GCC_AUTO_VECTORIZATION = YES;
   2.267 @@ -2547,20 +2455,18 @@
   2.268  				"GCC_VERSION[arch=x86_64]" = 4.2;
   2.269  				MACOSX_DEPLOYMENT_TARGET = 10.4;
   2.270  				"MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.6;
   2.271 -				PREBINDING = NO;
   2.272  				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
   2.273  				"SDKROOT[arch=x86_64]" = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";
   2.274  				SEPARATE_STRIP = YES;
   2.275  				STRIP_STYLE = "non-global";
   2.276  				WARNING_CFLAGS = "";
   2.277  			};
   2.278 -			name = Deployment_for_official_releases_using_10.4SDK_and_10.6SDK;
   2.279 +			name = Deployment_for_official_releases_using_10.6SDK;
   2.280  		};
   2.281  		007317910858DB0500B2BC32 /* Default */ = {
   2.282  			isa = XCBuildConfiguration;
   2.283  			buildSettings = {
   2.284 -				ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
   2.285 -				ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
   2.286 +				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
   2.287  				GCC_ALTIVEC_EXTENSIONS = YES;
   2.288  				GCC_AUTO_VECTORIZATION = YES;
   2.289  				GCC_ENABLE_CPP_EXCEPTIONS = NO;
   2.290 @@ -2571,11 +2477,10 @@
   2.291  				GCC_VERSION_i386 = 4.0;
   2.292  				GCC_VERSION_ppc = 4.0;
   2.293  				GCC_VERSION_x86_64 = 4.2;
   2.294 -				MACOSX_DEPLOYMENT_TARGET = "";
   2.295 +				MACOSX_DEPLOYMENT_TARGET = 10.4;
   2.296  				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
   2.297  				MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
   2.298  				MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.6;
   2.299 -				PREBINDING = NO;
   2.300  				SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
   2.301  				SDKROOT_ppc = /Developer/SDKs/MacOSX10.4u.sdk;
   2.302  				SDKROOT_x86_64 = /Developer/SDKs/MacOSX10.6.sdk;
   2.303 @@ -2584,26 +2489,20 @@
   2.304  			};
   2.305  			name = Default;
   2.306  		};
   2.307 -		008310401072EA5700A531F1 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */ = {
   2.308 +		008310401072EA5700A531F1 /* Deployment_for_official_releases_using_10.6SDK */ = {
   2.309  			isa = XCBuildConfiguration;
   2.310  			buildSettings = {
   2.311  				DOXYGEN_EXE = /Applications/Doxygen.app/Contents/Resources/doxygen;
   2.312 +				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.313  				PRODUCT_NAME = "Generate Doxygen DocSet";
   2.314  			};
   2.315 -			name = Deployment_for_official_releases_using_10.4SDK_and_10.6SDK;
   2.316 -		};
   2.317 -		008310411072EA5700A531F1 /* Development_using_10.4SDK_and_10.6SDK */ = {
   2.318 -			isa = XCBuildConfiguration;
   2.319 -			buildSettings = {
   2.320 -				DOXYGEN_EXE = /Applications/Doxygen.app/Contents/Resources/doxygen;
   2.321 -				PRODUCT_NAME = "Generate Doxygen DocSet";
   2.322 -			};
   2.323 -			name = Development_using_10.4SDK_and_10.6SDK;
   2.324 +			name = Deployment_for_official_releases_using_10.6SDK;
   2.325  		};
   2.326  		008310421072EA5700A531F1 /* Development_native_only */ = {
   2.327  			isa = XCBuildConfiguration;
   2.328  			buildSettings = {
   2.329  				DOXYGEN_EXE = /Applications/Doxygen.app/Contents/Resources/doxygen;
   2.330 +				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.331  				PRODUCT_NAME = "Generate Doxygen DocSet";
   2.332  			};
   2.333  			name = Development_native_only;
   2.334 @@ -2612,6 +2511,7 @@
   2.335  			isa = XCBuildConfiguration;
   2.336  			buildSettings = {
   2.337  				DOXYGEN_EXE = /Applications/Doxygen.app/Contents/Resources/doxygen;
   2.338 +				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.339  				PRODUCT_NAME = "Generate Doxygen DocSet";
   2.340  			};
   2.341  			name = Deployment_native_only;
   2.342 @@ -2620,6 +2520,7 @@
   2.343  			isa = XCBuildConfiguration;
   2.344  			buildSettings = {
   2.345  				DOXYGEN_EXE = /Applications/Doxygen.app/Contents/Resources/doxygen;
   2.346 +				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.347  				PRODUCT_NAME = "Generate Doxygen DocSet";
   2.348  			};
   2.349  			name = Default;
   2.350 @@ -2634,8 +2535,7 @@
   2.351  				GCC_ENABLE_CPP_RTTI = NO;
   2.352  				GCC_ENABLE_SSE3_EXTENSIONS = YES;
   2.353  				GCC_OPTIMIZATION_LEVEL = 3;
   2.354 -				MACOSX_DEPLOYMENT_TARGET = "";
   2.355 -				PREBINDING = NO;
   2.356 +				MACOSX_DEPLOYMENT_TARGET = 10.4;
   2.357  				SEPARATE_STRIP = YES;
   2.358  				STRIP_STYLE = "non-global";
   2.359  				WARNING_CFLAGS = "";
   2.360 @@ -2648,26 +2548,20 @@
   2.361  			buildSettings = {
   2.362  				DYLIB_COMPATIBILITY_VERSION = 1.3;
   2.363  				DYLIB_CURRENT_VERSION = 1.3.0;
   2.364 -				FRAMEWORK_VERSION = 1.3;
   2.365 +				FRAMEWORK_VERSION = B;
   2.366  				GCC_PREPROCESSOR_DEFINITIONS = (
   2.367  					"$(GCC_PREPROCESSOR_DEFINITIONS)",
   2.368 -					"SDL_VIDEO_DRIVER_DGA=1",
   2.369 -					"SDL_VIDEO_DRIVER_X11=1",
   2.370 -					"SDL_VIDEO_DRIVER_X11_DGAMOUSE=1",
   2.371  					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)",
   2.372  					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)",
   2.373  					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)",
   2.374  					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)",
   2.375 -					"SDL_VIDEO_DRIVER_X11_VIDMODE=1",
   2.376 -					"SDL_VIDEO_DRIVER_X11_XINERAMA=1",
   2.377 -					"SDL_VIDEO_DRIVER_X11_XME=1",
   2.378 -					"SDL_VIDEO_DRIVER_X11_XRANDR=1",
   2.379 -					"SDL_VIDEO_DRIVER_X11_XV=1",
   2.380  				);
   2.381  				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
   2.382 +				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.383  				HEADER_SEARCH_PATHS = /usr/X11R6/include;
   2.384  				INFOPLIST_FILE = "Info-Framework.plist";
   2.385  				INSTALL_PATH = "@executable_path/../Frameworks";
   2.386 +				OTHER_LDFLAGS = "-liconv";
   2.387  				PRODUCT_NAME = SDL;
   2.388  				WRAPPER_EXTENSION = framework;
   2.389  			};
   2.390 @@ -2692,6 +2586,7 @@
   2.391  					"SDL_VIDEO_DRIVER_X11_XV=1",
   2.392  				);
   2.393  				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
   2.394 +				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.395  				HEADER_SEARCH_PATHS = /usr/X11R6/include;
   2.396  				OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))";
   2.397  				PRODUCT_NAME = SDL;
   2.398 @@ -2701,6 +2596,7 @@
   2.399  		00CFA625106A567900758660 /* Deployment_native_only */ = {
   2.400  			isa = XCBuildConfiguration;
   2.401  			buildSettings = {
   2.402 +				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.403  				PRODUCT_NAME = "Standard DMG";
   2.404  			};
   2.405  			name = Deployment_native_only;
   2.406 @@ -2708,6 +2604,7 @@
   2.407  		00CFA626106A567900758660 /* Deployment_native_only */ = {
   2.408  			isa = XCBuildConfiguration;
   2.409  			buildSettings = {
   2.410 +				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.411  				PRODUCT_NAME = "Developer Extras Package";
   2.412  			};
   2.413  			name = Deployment_native_only;
   2.414 @@ -2721,8 +2618,7 @@
   2.415  				GCC_ENABLE_CPP_RTTI = NO;
   2.416  				GCC_ENABLE_SSE3_EXTENSIONS = YES;
   2.417  				GCC_OPTIMIZATION_LEVEL = 0;
   2.418 -				MACOSX_DEPLOYMENT_TARGET = "";
   2.419 -				PREBINDING = NO;
   2.420 +				MACOSX_DEPLOYMENT_TARGET = 10.4;
   2.421  				WARNING_CFLAGS = "";
   2.422  				ZERO_LINK = NO;
   2.423  			};
   2.424 @@ -2733,26 +2629,20 @@
   2.425  			buildSettings = {
   2.426  				DYLIB_COMPATIBILITY_VERSION = 1.3;
   2.427  				DYLIB_CURRENT_VERSION = 1.3.0;
   2.428 -				FRAMEWORK_VERSION = 1.3;
   2.429 +				FRAMEWORK_VERSION = B;
   2.430  				GCC_PREPROCESSOR_DEFINITIONS = (
   2.431  					"$(GCC_PREPROCESSOR_DEFINITIONS)",
   2.432 -					"SDL_VIDEO_DRIVER_DGA=1",
   2.433 -					"SDL_VIDEO_DRIVER_X11=1",
   2.434 -					"SDL_VIDEO_DRIVER_X11_DGAMOUSE=1",
   2.435  					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)",
   2.436  					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)",
   2.437  					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)",
   2.438  					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)",
   2.439 -					"SDL_VIDEO_DRIVER_X11_VIDMODE=1",
   2.440 -					"SDL_VIDEO_DRIVER_X11_XINERAMA=1",
   2.441 -					"SDL_VIDEO_DRIVER_X11_XME=1",
   2.442 -					"SDL_VIDEO_DRIVER_X11_XRANDR=1",
   2.443 -					"SDL_VIDEO_DRIVER_X11_XV=1",
   2.444  				);
   2.445  				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
   2.446 +				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.447  				HEADER_SEARCH_PATHS = /usr/X11R6/include;
   2.448  				INFOPLIST_FILE = "Info-Framework.plist";
   2.449  				INSTALL_PATH = "@executable_path/../Frameworks";
   2.450 +				OTHER_LDFLAGS = "-liconv";
   2.451  				PRODUCT_NAME = SDL;
   2.452  				WRAPPER_EXTENSION = framework;
   2.453  			};
   2.454 @@ -2777,6 +2667,7 @@
   2.455  					"SDL_VIDEO_DRIVER_X11_XV=1",
   2.456  				);
   2.457  				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
   2.458 +				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.459  				HEADER_SEARCH_PATHS = /usr/X11R6/include;
   2.460  				OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))";
   2.461  				PRODUCT_NAME = SDL;
   2.462 @@ -2786,6 +2677,7 @@
   2.463  		00CFA62B106A568900758660 /* Development_native_only */ = {
   2.464  			isa = XCBuildConfiguration;
   2.465  			buildSettings = {
   2.466 +				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.467  				PRODUCT_NAME = "Standard DMG";
   2.468  			};
   2.469  			name = Development_native_only;
   2.470 @@ -2793,17 +2685,18 @@
   2.471  		00CFA62C106A568900758660 /* Development_native_only */ = {
   2.472  			isa = XCBuildConfiguration;
   2.473  			buildSettings = {
   2.474 +				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.475  				PRODUCT_NAME = "Developer Extras Package";
   2.476  			};
   2.477  			name = Development_native_only;
   2.478  		};
   2.479 -		00D8D9F21195090800638393 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */ = {
   2.480 +		00D8D9F21195090800638393 /* Deployment_for_official_releases_using_10.6SDK */ = {
   2.481  			isa = XCBuildConfiguration;
   2.482  			buildSettings = {
   2.483  				ALWAYS_SEARCH_USER_PATHS = NO;
   2.484 -				GCC_ENABLE_FIX_AND_CONTINUE = YES;
   2.485  				GCC_MODEL_TUNING = G5;
   2.486  				GCC_PRECOMPILE_PREFIX_HEADER = NO;
   2.487 +				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.488  				INFOPLIST_FILE = "testsdl-Info.plist";
   2.489  				INSTALL_PATH = "$(HOME)/Applications";
   2.490  				OTHER_LDFLAGS = (
   2.491 @@ -2812,18 +2705,17 @@
   2.492  					"-framework",
   2.493  					AppKit,
   2.494  				);
   2.495 -				PREBINDING = NO;
   2.496  				PRODUCT_NAME = testsdl;
   2.497  			};
   2.498 -			name = Deployment_for_official_releases_using_10.4SDK_and_10.6SDK;
   2.499 +			name = Deployment_for_official_releases_using_10.6SDK;
   2.500  		};
   2.501 -		00D8D9F31195090800638393 /* Development_using_10.4SDK_and_10.6SDK */ = {
   2.502 +		00D8D9F41195090800638393 /* Development_native_only */ = {
   2.503  			isa = XCBuildConfiguration;
   2.504  			buildSettings = {
   2.505  				ALWAYS_SEARCH_USER_PATHS = NO;
   2.506 -				GCC_ENABLE_FIX_AND_CONTINUE = YES;
   2.507  				GCC_MODEL_TUNING = G5;
   2.508  				GCC_PRECOMPILE_PREFIX_HEADER = NO;
   2.509 +				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.510  				INFOPLIST_FILE = "testsdl-Info.plist";
   2.511  				INSTALL_PATH = "$(HOME)/Applications";
   2.512  				OTHER_LDFLAGS = (
   2.513 @@ -2832,18 +2724,17 @@
   2.514  					"-framework",
   2.515  					AppKit,
   2.516  				);
   2.517 -				PREBINDING = NO;
   2.518  				PRODUCT_NAME = testsdl;
   2.519  			};
   2.520 -			name = Development_using_10.4SDK_and_10.6SDK;
   2.521 +			name = Development_native_only;
   2.522  		};
   2.523 -		00D8D9F41195090800638393 /* Development_native_only */ = {
   2.524 +		00D8D9F51195090800638393 /* Deployment_native_only */ = {
   2.525  			isa = XCBuildConfiguration;
   2.526  			buildSettings = {
   2.527  				ALWAYS_SEARCH_USER_PATHS = NO;
   2.528 -				GCC_ENABLE_FIX_AND_CONTINUE = YES;
   2.529  				GCC_MODEL_TUNING = G5;
   2.530  				GCC_PRECOMPILE_PREFIX_HEADER = NO;
   2.531 +				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.532  				INFOPLIST_FILE = "testsdl-Info.plist";
   2.533  				INSTALL_PATH = "$(HOME)/Applications";
   2.534  				OTHER_LDFLAGS = (
   2.535 @@ -2852,18 +2743,17 @@
   2.536  					"-framework",
   2.537  					AppKit,
   2.538  				);
   2.539 -				PREBINDING = NO;
   2.540  				PRODUCT_NAME = testsdl;
   2.541  			};
   2.542 -			name = Development_native_only;
   2.543 +			name = Deployment_native_only;
   2.544  		};
   2.545 -		00D8D9F51195090800638393 /* Deployment_native_only */ = {
   2.546 +		00D8D9F61195090800638393 /* Default */ = {
   2.547  			isa = XCBuildConfiguration;
   2.548  			buildSettings = {
   2.549  				ALWAYS_SEARCH_USER_PATHS = NO;
   2.550 -				GCC_ENABLE_FIX_AND_CONTINUE = YES;
   2.551  				GCC_MODEL_TUNING = G5;
   2.552  				GCC_PRECOMPILE_PREFIX_HEADER = NO;
   2.553 +				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
   2.554  				INFOPLIST_FILE = "testsdl-Info.plist";
   2.555  				INSTALL_PATH = "$(HOME)/Applications";
   2.556  				OTHER_LDFLAGS = (
   2.557 @@ -2872,27 +2762,6 @@
   2.558  					"-framework",
   2.559  					AppKit,
   2.560  				);
   2.561 -				PREBINDING = NO;
   2.562 -				PRODUCT_NAME = testsdl;
   2.563 -			};
   2.564 -			name = Deployment_native_only;
   2.565 -		};
   2.566 -		00D8D9F61195090800638393 /* Default */ = {
   2.567 -			isa = XCBuildConfiguration;
   2.568 -			buildSettings = {
   2.569 -				ALWAYS_SEARCH_USER_PATHS = NO;
   2.570 -				GCC_ENABLE_FIX_AND_CONTINUE = YES;
   2.571 -				GCC_MODEL_TUNING = G5;
   2.572 -				GCC_PRECOMPILE_PREFIX_HEADER = NO;
   2.573 -				INFOPLIST_FILE = "testsdl-Info.plist";
   2.574 -				INSTALL_PATH = "$(HOME)/Applications";
   2.575 -				OTHER_LDFLAGS = (
   2.576 -					"-framework",
   2.577 -					Foundation,
   2.578 -					"-framework",
   2.579 -					AppKit,
   2.580 -				);
   2.581 -				PREBINDING = NO;
   2.582  				PRODUCT_NAME = testsdl;
   2.583  			};
   2.584  			name = Default;
   2.585 @@ -2903,8 +2772,7 @@
   2.586  		0073177A0858DB0500B2BC32 /* Build configuration list for PBXNativeTarget "Framework" */ = {
   2.587  			isa = XCConfigurationList;
   2.588  			buildConfigurations = (
   2.589 -				0073177C0858DB0500B2BC32 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */,
   2.590 -				0073177B0858DB0500B2BC32 /* Development_using_10.4SDK_and_10.6SDK */,
   2.591 +				0073177C0858DB0500B2BC32 /* Deployment_for_official_releases_using_10.6SDK */,
   2.592  				00CFA628106A568900758660 /* Development_native_only */,
   2.593  				00CFA622106A567900758660 /* Deployment_native_only */,
   2.594  				0073177D0858DB0500B2BC32 /* Default */,
   2.595 @@ -2915,8 +2783,7 @@
   2.596  		0073177E0858DB0500B2BC32 /* Build configuration list for PBXNativeTarget "Static Library" */ = {
   2.597  			isa = XCConfigurationList;
   2.598  			buildConfigurations = (
   2.599 -				007317800858DB0500B2BC32 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */,
   2.600 -				0073177F0858DB0500B2BC32 /* Development_using_10.4SDK_and_10.6SDK */,
   2.601 +				007317800858DB0500B2BC32 /* Deployment_for_official_releases_using_10.6SDK */,
   2.602  				00CFA629106A568900758660 /* Development_native_only */,
   2.603  				00CFA623106A567900758660 /* Deployment_native_only */,
   2.604  				007317810858DB0500B2BC32 /* Default */,
   2.605 @@ -2927,8 +2794,7 @@
   2.606  		007317860858DB0500B2BC32 /* Build configuration list for PBXNativeTarget "Standard DMG" */ = {
   2.607  			isa = XCConfigurationList;
   2.608  			buildConfigurations = (
   2.609 -				007317880858DB0500B2BC32 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */,
   2.610 -				007317870858DB0500B2BC32 /* Development_using_10.4SDK_and_10.6SDK */,
   2.611 +				007317880858DB0500B2BC32 /* Deployment_for_official_releases_using_10.6SDK */,
   2.612  				00CFA62B106A568900758660 /* Development_native_only */,
   2.613  				00CFA625106A567900758660 /* Deployment_native_only */,
   2.614  				007317890858DB0500B2BC32 /* Default */,
   2.615 @@ -2939,8 +2805,7 @@
   2.616  		0073178A0858DB0500B2BC32 /* Build configuration list for PBXNativeTarget "Developer Extras Package" */ = {
   2.617  			isa = XCConfigurationList;
   2.618  			buildConfigurations = (
   2.619 -				0073178C0858DB0500B2BC32 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */,
   2.620 -				0073178B0858DB0500B2BC32 /* Development_using_10.4SDK_and_10.6SDK */,
   2.621 +				0073178C0858DB0500B2BC32 /* Deployment_for_official_releases_using_10.6SDK */,
   2.622  				00CFA62C106A568900758660 /* Development_native_only */,
   2.623  				00CFA626106A567900758660 /* Deployment_native_only */,
   2.624  				0073178D0858DB0500B2BC32 /* Default */,
   2.625 @@ -2951,8 +2816,7 @@
   2.626  		0073178E0858DB0500B2BC32 /* Build configuration list for PBXProject "SDL" */ = {
   2.627  			isa = XCConfigurationList;
   2.628  			buildConfigurations = (
   2.629 -				007317900858DB0500B2BC32 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */,
   2.630 -				0073178F0858DB0500B2BC32 /* Development_using_10.4SDK_and_10.6SDK */,
   2.631 +				007317900858DB0500B2BC32 /* Deployment_for_official_releases_using_10.6SDK */,
   2.632  				00CFA627106A568900758660 /* Development_native_only */,
   2.633  				00CFA621106A567900758660 /* Deployment_native_only */,
   2.634  				007317910858DB0500B2BC32 /* Default */,
   2.635 @@ -2963,8 +2827,7 @@
   2.636  		008310471072EAAE00A531F1 /* Build configuration list for PBXAggregateTarget "Generate Doxygen DocSet" */ = {
   2.637  			isa = XCConfigurationList;
   2.638  			buildConfigurations = (
   2.639 -				008310401072EA5700A531F1 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */,
   2.640 -				008310411072EA5700A531F1 /* Development_using_10.4SDK_and_10.6SDK */,
   2.641 +				008310401072EA5700A531F1 /* Deployment_for_official_releases_using_10.6SDK */,
   2.642  				008310421072EA5700A531F1 /* Development_native_only */,
   2.643  				008310431072EA5700A531F1 /* Deployment_native_only */,
   2.644  				008310441072EA5700A531F1 /* Default */,
   2.645 @@ -2975,8 +2838,7 @@
   2.646  		00D8D9F71195090900638393 /* Build configuration list for PBXNativeTarget "testsdl" */ = {
   2.647  			isa = XCConfigurationList;
   2.648  			buildConfigurations = (
   2.649 -				00D8D9F21195090800638393 /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */,
   2.650 -				00D8D9F31195090800638393 /* Development_using_10.4SDK_and_10.6SDK */,
   2.651 +				00D8D9F21195090800638393 /* Deployment_for_official_releases_using_10.6SDK */,
   2.652  				00D8D9F41195090800638393 /* Development_native_only */,
   2.653  				00D8D9F51195090800638393 /* Deployment_native_only */,
   2.654  				00D8D9F61195090800638393 /* Default */,