Updated iOS projects and renamed iPhoneOS to iOS

39 files changed, 45 insertions, 332 deletions

diff --git a/Makefile.in b/Makefile.in
index 443b91bc11..0a5fdb1380 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -36,7 +36,7 @@ VERSION_OBJECTS = @VERSION_OBJECTS@
 SDLMAIN_TARGET = libSDLmain.a
 SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@
 
-SRC_DIST = acinclude Android.mk autogen.sh Borland.html Borland.zip BUGS build-scripts configure configure.in COPYING CREDITS include INSTALL Makefile.minimal Makefile.in README* sdl-config.in sdl.m4 sdl.pc.in SDL.spec.in src test TODO VisualC.html VisualC VisualCE Watcom-Win32.zip WhatsNew Xcode Xcode-iPhoneOS
+SRC_DIST = acinclude Android.mk autogen.sh Borland.html Borland.zip BUGS build-scripts configure configure.in COPYING CREDITS include INSTALL Makefile.minimal Makefile.in README* sdl-config.in sdl.m4 sdl.pc.in SDL.spec.in src test TODO VisualC.html VisualC VisualCE Watcom-Win32.zip WhatsNew Xcode Xcode-iOS
 GEN_DIST = SDL.spec
 
 HDRS = \
diff --git a/README.iphoneos b/README.iOS
index 39ff14da92..6ace6bc038 100644
--- a/README.iphoneos
+++ b/README.iOS
@@ -5,30 +5,31 @@ Building the Simple DirectMedia Layer for iPhone OS 2.0
 Requirements: Mac OS X v10.5 or later and the iPhone SDK.
 
 Instructions:
-1.  Open SDLiPhoneOS.xcodeproj (located in Xcode-iPhoneOS/SDL) in XCode.
-2.  Set Project->Set Active SDK to "Use Project Settings"
-3.  Select your desired target, and hit build.
+1.  Open SDL.xcodeproj (located in Xcode-iOS/SDL) in XCode.
+2.  Select your desired target, and hit build.
 
 There are three build targets:
-- StaticLibiPhoneOS:
-	Build SDL as a statically linked (armv6) library for iPhone OS 2.0.
-- StaticLibSimulator:
-	Build SDL as a statically linked (x86) library for the iPhone Simulator
+- libSDL.a:
+	Build SDL as a statically linked library
+- testsdl
+	Build a test program (there are known test failures which are fine)
 - Template:
 	Package a project template together with the SDL for iPhone static libraries and copies of the SDL headers.  The template includes proper references to the SDL library and headers, skeleton code for a basic SDL program, and placeholder graphics for the application icon and startup screen.
 
 ==============================================================================
-Using the Simple DirectMedia Layer for iPhone OS 2.0
+Using the Simple DirectMedia Layer for iOS
 ==============================================================================
 
+FIXME: This needs to be updated for the latest methods
+
 Here is the easiest method:
-1.  Build the SDL libraries (libSDLiPhoneOS.a and libSDLSimulator.a) and the iPhone SDL Application template.
-1.  Install the iPhone SDL Application template by copying it to one of XCode's template directories.  I recommend creating a directory called "SDL" in "/Developer/Platforms/iPhoneOS.platform/Developer/Library/XCode/Project Templates/" and placing it there.
+1.  Build the SDL libraries (libSDL.a and libSDLSimulator.a) and the iPhone SDL Application template.
+1.  Install the iPhone SDL Application template by copying it to one of XCode's template directories.  I recommend creating a directory called "SDL" in "/Developer/Platforms/iOS.platform/Developer/Library/XCode/Project Templates/" and placing it there.
 2.  Start a new project using the template.  The project should be immediately ready for use with SDL.
 
 Here is a more manual method:
 1.  Create a new iPhone view based application.
-2.  Build the SDL static libraries (libSDLiPhoneOS.a and libSDLSimulator.a) for iPhone and include them in your project.  XCode will ignore the library that is not currently of the correct architecture, hence your app will work both on iPhone and in the iPhone Simulator.
+2.  Build the SDL static libraries (libSDL.a and libSDLSimulator.a) for iPhone and include them in your project.  XCode will ignore the library that is not currently of the correct architecture, hence your app will work both on iPhone and in the iPhone Simulator.
 3.  Include the SDL header files in your project.
 4.  Remove the ApplicationDelegate.h and ApplicationDelegate.m files -- SDL for iPhone provides its own UIApplicationDelegate.  Remove MainWindow.xib -- SDL for iPhone produces its user interface programmatically.
 5.  Delete the contents of main.m and program your app as a regular SDL program instead.  You may replace main.m with your own main.c, but you must tell XCode not to use the project prefix file, as it includes Objective-C code.
@@ -86,7 +87,7 @@ MySDLApp Home/
 When your SDL based iPhone application starts up, it sets the working directory to the main bundle (MySDLApp Home/MySDLApp.app), where your application resources are stored.  You cannot write to this directory.  Instead, I advise you to write document files to "../Documents/" and preferences to "../Library/Preferences".  
 
 More information on this subject is available here:
-http://developer.apple.com/iphone/library/documentation/iPhone/Conceptual/iPhoneOSProgrammingGuide/ApplicationEnvironment/chapter_6_section_3.html#//apple_ref/doc/uid/TP40007072-CH7-SW21
+http://developer.apple.com/library/ios/#documentation/iPhone/Conceptual/iPhoneOSProgrammingGuide/Introduction/Introduction.html
 
 ==============================================================================
 Notes -- iPhone SDL limitations
@@ -107,5 +108,3 @@ Audio:
 Loading Shared Objects:
 	This is disabled by default since it seems to break the terms of the iPhone SDK agreement.  It can be re-enabled in SDL_config_iphoneos.h.
 
-
-
diff --git a/Xcode-iPhoneOS/Demos/Default.png b/Xcode-iOS/Demos/Default.png
index f91282875a..f91282875a 100644
--- a/Xcode-iPhoneOS/Demos/Default.png
+++ b/Xcode-iOS/Demos/Default.png
diff --git a/Xcode-iPhoneOS/Demos/DemosiPhoneOS.xcodeproj/project.pbxproj b/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj
index 32d22d83dc..733ebd6725 100755
--- a/Xcode-iPhoneOS/Demos/DemosiPhoneOS.xcodeproj/project.pbxproj
+++ b/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 45;
+	objectVersion = 46;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -107,66 +107,66 @@
 /* Begin PBXContainerItemProxy section */
 		049F3694130CD86800FF080F /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = FD1B48920E313154007AB34E /* SDLiPhoneOS.xcodeproj */;
+			containerPortal = FD1B48920E313154007AB34E /* SDL.xcodeproj */;
 			proxyType = 1;
 			remoteGlobalIDString = FD6526620DE8FCCB002AD96B;
 			remoteInfo = libSDL;
 		};
 		049F3696130CD87600FF080F /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = FD1B48920E313154007AB34E /* SDLiPhoneOS.xcodeproj */;
+			containerPortal = FD1B48920E313154007AB34E /* SDL.xcodeproj */;
 			proxyType = 1;
 			remoteGlobalIDString = FD6526620DE8FCCB002AD96B;
 			remoteInfo = libSDL;
 		};
 		049F3698130CD87F00FF080F /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = FD1B48920E313154007AB34E /* SDLiPhoneOS.xcodeproj */;
+			containerPortal = FD1B48920E313154007AB34E /* SDL.xcodeproj */;
 			proxyType = 1;
 			remoteGlobalIDString = FD6526620DE8FCCB002AD96B;
 			remoteInfo = libSDL;
 		};
 		049F369A130CD88800FF080F /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = FD1B48920E313154007AB34E /* SDLiPhoneOS.xcodeproj */;
+			containerPortal = FD1B48920E313154007AB34E /* SDL.xcodeproj */;
 			proxyType = 1;
 			remoteGlobalIDString = FD6526620DE8FCCB002AD96B;
 			remoteInfo = libSDL;
 		};
 		049F369C130CD89000FF080F /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = FD1B48920E313154007AB34E /* SDLiPhoneOS.xcodeproj */;
+			containerPortal = FD1B48920E313154007AB34E /* SDL.xcodeproj */;
 			proxyType = 1;
 			remoteGlobalIDString = FD6526620DE8FCCB002AD96B;
 			remoteInfo = libSDL;
 		};
 		049F369E130CD89800FF080F /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = FD1B48920E313154007AB34E /* SDLiPhoneOS.xcodeproj */;
+			containerPortal = FD1B48920E313154007AB34E /* SDL.xcodeproj */;
 			proxyType = 1;
 			remoteGlobalIDString = FD6526620DE8FCCB002AD96B;
 			remoteInfo = libSDL;
 		};
 		049F36A0130CD8A000FF080F /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = FD1B48920E313154007AB34E /* SDLiPhoneOS.xcodeproj */;
+			containerPortal = FD1B48920E313154007AB34E /* SDL.xcodeproj */;
 			proxyType = 1;
 			remoteGlobalIDString = FD6526620DE8FCCB002AD96B;
 			remoteInfo = libSDL;
 		};
 		04AB757011E563D200BE9753 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = FD1B48920E313154007AB34E /* SDLiPhoneOS.xcodeproj */;
+			containerPortal = FD1B48920E313154007AB34E /* SDL.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 006E982211955059001DE610;
 			remoteInfo = testsdl;
 		};
 		FD1B489D0E313154007AB34E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = FD1B48920E313154007AB34E /* SDLiPhoneOS.xcodeproj */;
+			containerPortal = FD1B48920E313154007AB34E /* SDL.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = FD6526630DE8FCCB002AD96B;
-			remoteInfo = StaticLibiPhoneOS;
+			remoteInfo = StaticLib;
 		};
 /* End PBXContainerItemProxy section */
 
@@ -177,7 +177,7 @@
 		1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		FD15FCB20E086866003BDF25 /* Happy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Happy.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		FD1B48920E313154007AB34E /* SDLiPhoneOS.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDLiPhoneOS.xcodeproj; path = ../SDL/SDLiPhoneOS.xcodeproj; sourceTree = SOURCE_ROOT; };
+		FD1B48920E313154007AB34E /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = ../SDL/SDL.xcodeproj; sourceTree = SOURCE_ROOT; };
 		FD5F9BE40E0DEBEA008E885B /* Accel.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Accel.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		FD77A0050E26BC0500F39101 /* accelerometer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = accelerometer.c; sourceTree = "<group>"; };
 		FD77A0060E26BC0500F39101 /* common.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = common.c; sourceTree = "<group>"; };
@@ -336,7 +336,7 @@
 		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
 			isa = PBXGroup;
 			children = (
-				FD1B48920E313154007AB34E /* SDLiPhoneOS.xcodeproj */,
+				FD1B48920E313154007AB34E /* SDL.xcodeproj */,
 				FD77A0040E26BC0500F39101 /* src */,
 				29B97317FDCFA39411CA2CEA /* Resources */,
 				29B97323FDCFA39411CA2CEA /* Frameworks */,
@@ -562,8 +562,11 @@
 /* Begin PBXProject section */
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
-			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "DemosiPhoneOS" */;
-			compatibilityVersion = "Xcode 3.1";
+			attributes = {
+				LastUpgradeCheck = 0420;
+			};
+			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Demos" */;
+			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
@@ -577,7 +580,7 @@
 			projectReferences = (
 				{
 					ProductGroup = FD1B48930E313154007AB34E /* Products */;
-					ProjectRef = FD1B48920E313154007AB34E /* SDLiPhoneOS.xcodeproj */;
+					ProjectRef = FD1B48920E313154007AB34E /* SDL.xcodeproj */;
 				},
 			);
 			projectRoot = "";
@@ -795,20 +798,7 @@
 		1D6058940D05DD3E006BFB54 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../SDLiPod/build/Debug-iphoneos\"",
-					"\"$(SRCROOT)/../SDLiPod/build/Release-iphoneos\"",
-					"\"$(SRCROOT)\"",
-					"\"$(SRCROOT)/../SDLiPod/build/Debug-iphonesimulator\"",
-					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
-				);
 				PRODUCT_NAME = Rectangles;
 			};
 			name = Debug;
@@ -816,18 +806,7 @@
 		1D6058950D05DD3E006BFB54 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../SDLiPod/build/Debug-iphoneos\"",
-					"\"$(SRCROOT)/../SDLiPod/build/Release-iphoneos\"",
-					"\"$(SRCROOT)\"",
-					"\"$(SRCROOT)/../SDLiPod/build/Debug-iphonesimulator\"",
-					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
-				);
 				PRODUCT_NAME = Rectangles;
 			};
 			name = Release;
@@ -835,19 +814,11 @@
 		C01FCF4F08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
 				HEADER_SEARCH_PATHS = ../../include;
 				IPHONEOS_DEPLOYMENT_TARGET = 3.1.3;
-				LIBRARY_SEARCH_PATHS = "";
-				ONLY_ACTIVE_ARCH = YES;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "-ObjC";
-				PREBINDING = NO;
 				PRELINK_LIBS = "";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -857,18 +828,10 @@
 		C01FCF5008A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = ../../include;
 				IPHONEOS_DEPLOYMENT_TARGET = 3.1.3;
-				LIBRARY_SEARCH_PATHS = "";
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "-ObjC";
-				PREBINDING = NO;
 				PRELINK_LIBS = "";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -878,19 +841,8 @@
 		FD15FCB50E086866003BDF25 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
-				);
-				PREBINDING = NO;
 				PRODUCT_NAME = Happy;
 				SDKROOT = iphoneos;
 			};
@@ -899,42 +851,16 @@
 		FD15FCB60E086866003BDF25 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
-				);
-				PREBINDING = NO;
 				PRODUCT_NAME = Happy;
 				SDKROOT = iphoneos;
-				ZERO_LINK = NO;
 			};
 			name = Release;
 		};
 		FD5F9BE70E0DEBEB008E885B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
-				);
-				PREBINDING = NO;
 				PRODUCT_NAME = Accel;
 				SDKROOT = iphoneos;
 			};
@@ -943,40 +869,16 @@
 		FD5F9BE80E0DEBEB008E885B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
-				);
-				PREBINDING = NO;
 				PRODUCT_NAME = Accel;
 				SDKROOT = iphoneos;
-				ZERO_LINK = NO;
 			};
 			name = Release;
 		};
 		FDB6520A0E43D1F300F688B5 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				PREBINDING = NO;
 				PRODUCT_NAME = Keyboard;
 				SDKROOT = iphoneos;
 			};
@@ -985,40 +887,16 @@
 		FDB6520B0E43D1F300F688B5 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				PREBINDING = NO;
-				PRODUCT_NAME = Fireworks;
+				PRODUCT_NAME = Keyboard;
 				SDKROOT = iphoneos;
-				ZERO_LINK = NO;
 			};
 			name = Release;
 		};
 		FDC202EC0E107B1200ABAC90 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
-				);
-				PREBINDING = NO;
 				PRODUCT_NAME = Touch;
 				SDKROOT = iphoneos;
 			};
@@ -1027,40 +905,16 @@
 		FDC202ED0E107B1200ABAC90 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
-				);
-				PREBINDING = NO;
 				PRODUCT_NAME = Touch;
 				SDKROOT = iphoneos;
-				ZERO_LINK = NO;
 			};
 			name = Release;
 		};
 		FDC52EDC0E2843D6008D768C /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				PREBINDING = NO;
 				PRODUCT_NAME = Fireworks;
 				SDKROOT = iphoneos;
 			};
@@ -1069,41 +923,16 @@
 		FDC52EDD0E2843D6008D768C /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				PREBINDING = NO;
 				PRODUCT_NAME = Fireworks;
 				SDKROOT = iphoneos;
-				ZERO_LINK = NO;
 			};
 			name = Release;
 		};
 		FDF0D6A20E12D05400247964 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)\"",
-					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
-				);
-				PREBINDING = NO;
 				PRODUCT_NAME = Mixer;
 				SDKROOT = iphoneos;
 			};
@@ -1112,24 +941,9 @@
 		FDF0D6A30E12D05400247964 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)\"",
-					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
-				);
-				PREBINDING = NO;
 				PRODUCT_NAME = Mixer;
 				SDKROOT = iphoneos;
-				ZERO_LINK = NO;
 			};
 			name = Release;
 		};
@@ -1145,7 +959,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "DemosiPhoneOS" */ = {
+		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Demos" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				C01FCF4F08A954540054247B /* Debug */,
diff --git a/Xcode-iPhoneOS/Demos/Icon.png b/Xcode-iOS/Demos/Icon.png
index 83f4d10a21..83f4d10a21 100644
--- a/Xcode-iPhoneOS/Demos/Icon.png
+++ b/Xcode-iOS/Demos/Icon.png
diff --git a/Xcode-iPhoneOS/Demos/Info.plist b/Xcode-iOS/Demos/Info.plist
index c0f1179d35..c0f1179d35 100644
--- a/Xcode-iPhoneOS/Demos/Info.plist
+++ b/Xcode-iOS/Demos/Info.plist
diff --git a/Xcode-iPhoneOS/Demos/README b/Xcode-iOS/Demos/README
index 76c1c09a11..55f8066d66 100644
--- a/Xcode-iPhoneOS/Demos/README
+++ b/Xcode-iOS/Demos/README
@@ -2,7 +2,7 @@
 About the iPhone OS Demo Applications
 ==============================================================================
 
-DemosiPhoneOS.xcodeproj contains several targets for iPhone oriented SDL demos.  These demos are written strictly using SDL 1.3 calls.  All the demos except for Fireworks (which requires OpenGL ES) should work on platforms other than iPhone OS, though you'll need to write your own compile script.  To run them on your favorite platform, you may wish to set the macros SCREEN_WIDTH and SCREEN_HEIGHT, located in common.h.
+Demos.xcodeproj contains several targets for iPhone oriented SDL demos.  These demos are written strictly using SDL 1.3 calls.  All the demos except for Fireworks (which requires OpenGL ES) should work on platforms other than iPhone OS, though you'll need to write your own compile script.  To run them on your favorite platform, you may wish to set the macros SCREEN_WIDTH and SCREEN_HEIGHT, located in common.h.
 
 Common files:
 
diff --git a/Xcode-iPhoneOS/Demos/data/bitmapfont/kromasky_16x16.bmp b/Xcode-iOS/Demos/data/bitmapfont/kromasky_16x16.bmp
index c0b6fb964f..c0b6fb964f 100644
--- a/Xcode-iPhoneOS/Demos/data/bitmapfont/kromasky_16x16.bmp
+++ b/Xcode-iOS/Demos/data/bitmapfont/kromasky_16x16.bmp
diff --git a/Xcode-iPhoneOS/Demos/data/bitmapfont/license.txt b/Xcode-iOS/Demos/data/bitmapfont/license.txt
index 6949ec444b..6949ec444b 100755
--- a/Xcode-iPhoneOS/Demos/data/bitmapfont/license.txt
+++ b/Xcode-iOS/Demos/data/bitmapfont/license.txt
diff --git a/Xcode-iPhoneOS/Demos/data/drums/ds_brush_snare.wav b/Xcode-iOS/Demos/data/drums/ds_brush_snare.wav
index fa752637a0..fa752637a0 100644
--- a/Xcode-iPhoneOS/Demos/data/drums/ds_brush_snare.wav
+++ b/Xcode-iOS/Demos/data/drums/ds_brush_snare.wav
diff --git a/Xcode-iPhoneOS/Demos/data/drums/ds_china.wav b/Xcode-iOS/Demos/data/drums/ds_china.wav
index 21a71a1b1e..21a71a1b1e 100644
--- a/Xcode-iPhoneOS/Demos/data/drums/ds_china.wav
+++ b/Xcode-iOS/Demos/data/drums/ds_china.wav
diff --git a/Xcode-iPhoneOS/Demos/data/drums/ds_kick_big_amb.wav b/Xcode-iOS/Demos/data/drums/ds_kick_big_amb.wav
index 404115a18d..404115a18d 100644
--- a/Xcode-iPhoneOS/Demos/data/drums/ds_kick_big_amb.wav
+++ b/Xcode-iOS/Demos/data/drums/ds_kick_big_amb.wav
diff --git a/Xcode-iPhoneOS/Demos/data/drums/ds_loose_skin_mute.wav b/Xcode-iOS/Demos/data/drums/ds_loose_skin_mute.wav
index 3db05222b5..3db05222b5 100644
--- a/Xcode-iPhoneOS/Demos/data/drums/ds_loose_skin_mute.wav
+++ b/Xcode-iOS/Demos/data/drums/ds_loose_skin_mute.wav
diff --git a/Xcode-iPhoneOS/Demos/data/icon.bmp b/Xcode-iOS/Demos/data/icon.bmp
index cc96356acb..cc96356acb 100644
--- a/Xcode-iPhoneOS/Demos/data/icon.bmp
+++ b/Xcode-iOS/Demos/data/icon.bmp
diff --git a/Xcode-iPhoneOS/Demos/data/ship.bmp b/Xcode-iOS/Demos/data/ship.bmp
index b682dc49d3..b682dc49d3 100644
--- a/Xcode-iPhoneOS/Demos/data/ship.bmp
+++ b/Xcode-iOS/Demos/data/ship.bmp
diff --git a/Xcode-iPhoneOS/Demos/data/space.bmp b/Xcode-iOS/Demos/data/space.bmp
index 5bcf273a83..5bcf273a83 100644
--- a/Xcode-iPhoneOS/Demos/data/space.bmp
+++ b/Xcode-iOS/Demos/data/space.bmp
diff --git a/Xcode-iPhoneOS/Demos/data/stroke.bmp b/Xcode-iOS/Demos/data/stroke.bmp
index d59fed4590..d59fed4590 100644
--- a/Xcode-iPhoneOS/Demos/data/stroke.bmp
+++ b/Xcode-iOS/Demos/data/stroke.bmp
diff --git a/Xcode-iPhoneOS/Demos/src/accelerometer.c b/Xcode-iOS/Demos/src/accelerometer.c
index 339febc119..339febc119 100644
--- a/Xcode-iPhoneOS/Demos/src/accelerometer.c
+++ b/Xcode-iOS/Demos/src/accelerometer.c
diff --git a/Xcode-iPhoneOS/Demos/src/common.c b/Xcode-iOS/Demos/src/common.c
index fd3a176db1..fd3a176db1 100644
--- a/Xcode-iPhoneOS/Demos/src/common.c
+++ b/Xcode-iOS/Demos/src/common.c
diff --git a/Xcode-iPhoneOS/Demos/src/common.h b/Xcode-iOS/Demos/src/common.h
index 9aa01a23eb..9aa01a23eb 100644
--- a/Xcode-iPhoneOS/Demos/src/common.h
+++ b/Xcode-iOS/Demos/src/common.h
diff --git a/Xcode-iPhoneOS/Demos/src/fireworks.c b/Xcode-iOS/Demos/src/fireworks.c
index fa39abff52..fa39abff52 100644
--- a/Xcode-iPhoneOS/Demos/src/fireworks.c
+++ b/Xcode-iOS/Demos/src/fireworks.c
diff --git a/Xcode-iPhoneOS/Demos/src/happy.c b/Xcode-iOS/Demos/src/happy.c
index c1731b8797..c1731b8797 100644
--- a/Xcode-iPhoneOS/Demos/src/happy.c
+++ b/Xcode-iOS/Demos/src/happy.c
diff --git a/Xcode-iPhoneOS/Demos/src/keyboard.c b/Xcode-iOS/Demos/src/keyboard.c
index d7e5cf96cd..d7e5cf96cd 100644
--- a/Xcode-iPhoneOS/Demos/src/keyboard.c
+++ b/Xcode-iOS/Demos/src/keyboard.c
diff --git a/Xcode-iPhoneOS/Demos/src/mixer.c b/Xcode-iOS/Demos/src/mixer.c
index 893361f9a5..893361f9a5 100644
--- a/Xcode-iPhoneOS/Demos/src/mixer.c
+++ b/Xcode-iOS/Demos/src/mixer.c
diff --git a/Xcode-iPhoneOS/Demos/src/rectangles.c b/Xcode-iOS/Demos/src/rectangles.c
index 4dcb320356..4dcb320356 100644
--- a/Xcode-iPhoneOS/Demos/src/rectangles.c
+++ b/Xcode-iOS/Demos/src/rectangles.c
diff --git a/Xcode-iPhoneOS/Demos/src/touch.c b/Xcode-iOS/Demos/src/touch.c
index 8ce8006a09..8ce8006a09 100644
--- a/Xcode-iPhoneOS/Demos/src/touch.c
+++ b/Xcode-iOS/Demos/src/touch.c
diff --git a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj b/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj
index 12d3f0bfa2..73699d6ba8 100755
--- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj
+++ b/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj
@@ -7,17 +7,6 @@
 	objects = {
 
 /* Begin PBXAggregateTarget section */
-		00B4F47112F696830084EC00 /* BuildUniversalSimulatorDevicelibSDL */ = {
-			isa = PBXAggregateTarget;
-			buildConfigurationList = 00B4F47412F696B30084EC00 /* Build configuration list for PBXAggregateTarget "BuildUniversalSimulatorDevicelibSDL" */;
-			buildPhases = (
-				00B4F47012F696830084EC00 /* ShellScript */,
-			);
-			dependencies = (
-			);
-			name = BuildUniversalSimulatorDevicelibSDL;
-			productName = "Build Universal Simulator/Device libSDL";
-		};
 		00B4F48B12F6A69C0084EC00 /* PrepareXcodeProjectTemplate */ = {
 			isa = PBXAggregateTarget;
 			buildConfigurationList = 00B4F48E12F6A6BA0084EC00 /* Build configuration list for PBXAggregateTarget "PrepareXcodeProjectTemplate" */;
@@ -25,7 +14,6 @@
 				00B4F48A12F6A69C0084EC00 /* ShellScript */,
 			);
 			dependencies = (
-				00B4F49712F6A7B00084EC00 /* PBXTargetDependency */,
 			);
 			name = PrepareXcodeProjectTemplate;
 			productName = PrepareXcodeProjectTemplate;
@@ -248,14 +236,7 @@
 			containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = FD6526620DE8FCCB002AD96B;
-			remoteInfo = StaticLibiPhoneOS;
-		};
-		00B4F49612F6A7B00084EC00 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 00B4F47112F696830084EC00;
-			remoteInfo = BuildUniversalSimulatorDevicelibSDL;
+			remoteInfo = StaticLib;
 		};
 /* End PBXContainerItemProxy section */
 
@@ -1298,7 +1279,10 @@
 /* Begin PBXProject section */
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
-			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SDLiPhoneOS" */;
+			attributes = {
+				LastUpgradeCheck = 0420;
+			};
+			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SDL" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
@@ -1314,7 +1298,6 @@
 			targets = (
 				FD6526620DE8FCCB002AD96B /* libSDL */,
 				006E982111955059001DE610 /* testsdl */,
-				00B4F47112F696830084EC00 /* BuildUniversalSimulatorDevicelibSDL */,
 				00B4F48B12F6A69C0084EC00 /* PrepareXcodeProjectTemplate */,
 			);
 		};
@@ -1338,22 +1321,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		00B4F47012F696830084EC00 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"$(SYMROOT)/$(CONFIGURATION)-iphonesimulator/libSDL.a",
-				"$(SYMROOT)/$(CONFIGURATION)-iphoneos/libSDL.a",
-			);
-			outputPaths = (
-				"$(SYMROOT)/$CONFIGURATION-Universal/libSDL.a",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# Build the simulator binary\n# xcodebuild -project SDLiPhoneOS.xcodeproj -target libSDL -configuration Release -sdk iphonesimulator\nxcodebuild -project SDLiPhoneOS.xcodeproj -target libSDL -configuration $CONFIGURATION -sdk iphonesimulator\n\n# Build the device binary\n# xcodebuild -project SDLiPhoneOS.xcodeproj -target libSDL -configuration Release -sdk iphoneos\nxcodebuild -project SDLiPhoneOS.xcodeproj -target libSDL -configuration $CONFIGURATION -sdk iphoneos\n\n# create a simulator/device fat binary from the 2 separate builds\nlipo $SYMROOT/$CONFIGURATION-iphonesimulator/libSDL.a $SYMROOT/$CONFIGURATION-iphoneos/libSDL.a -output $SYMROOT/$CONFIGURATION-Universal/libSDL.a -create\n\necho \"Created Universal Simulator/Device binary at $SYMROOT/$CONFIGURATION-Universal/libSDL.a\"\n\n\nexit 0\n";
-		};
 		00B4F48A12F6A69C0084EC00 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -1493,23 +1460,14 @@
 			target = FD6526620DE8FCCB002AD96B /* libSDL */;
 			targetProxy = 006E982A11955065001DE610 /* PBXContainerItemProxy */;
 		};
-		00B4F49712F6A7B00084EC00 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 00B4F47112F696830084EC00 /* BuildUniversalSimulatorDevicelibSDL */;
-			targetProxy = 00B4F49612F6A7B00084EC00 /* PBXContainerItemProxy */;
-		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
 		006E98251195505B001DE610 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				INFOPLIST_FILE = "testsdl-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				OTHER_LDFLAGS = (
@@ -1518,7 +1476,6 @@
 					"-framework",
 					UIKit,
 				);
-				PREBINDING = NO;
 				PRODUCT_NAME = testsdl;
 			};
 			name = Debug;
@@ -1526,12 +1483,8 @@
 		006E98261195505B001DE610 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				INFOPLIST_FILE = "testsdl-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				OTHER_LDFLAGS = (
@@ -1540,30 +1493,7 @@
 					"-framework",
 					UIKit,
 				);
-				PREBINDING = NO;
 				PRODUCT_NAME = testsdl;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		00B4F47212F696830084EC00 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				PRODUCT_NAME = BuildUniversalSimulatorDevicelibSDL;
-			};
-			name = Debug;
-		};
-		00B4F47312F696830084EC00 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				PRODUCT_NAME = BuildUniversalSimulatorDevicelibSDL;
-				ZERO_LINK = NO;
 			};
 			name = Release;
 		};
@@ -1582,7 +1512,6 @@
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				PRODUCT_NAME = PrepareXcodeProjectTemplate;
 				ZERO_LINK = NO;
 			};
@@ -1591,16 +1520,11 @@
 		C01FCF4F08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_DEBUGGING_SYMBOLS = full;
+				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = NO;
 				IPHONEOS_DEPLOYMENT_TARGET = 3.1.3;
-				ONLY_ACTIVE_ARCH = NO;
-				PREBINDING = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -1609,14 +1533,10 @@
 		C01FCF5008A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = NO;
 				IPHONEOS_DEPLOYMENT_TARGET = 3.1.3;
-				PREBINDING = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -1625,12 +1545,7 @@
 		FD6526640DE8FCCB002AD96B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = NO;
-				DEPLOYMENT_LOCATION = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				PREBINDING = NO;
 				PRODUCT_NAME = SDL;
 				SKIP_INSTALL = YES;
 			};
@@ -1639,15 +1554,9 @@
 		FD6526650DE8FCCB002AD96B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEPLOYMENT_LOCATION = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				PREBINDING = NO;
 				PRODUCT_NAME = SDL;
 				SKIP_INSTALL = YES;
-				ZERO_LINK = NO;
 			};
 			name = Release;
 		};
@@ -1663,15 +1572,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		00B4F47412F696B30084EC00 /* Build configuration list for PBXAggregateTarget "BuildUniversalSimulatorDevicelibSDL" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				00B4F47212F696830084EC00 /* Debug */,
-				00B4F47312F696830084EC00 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		00B4F48E12F6A6BA0084EC00 /* Build configuration list for PBXAggregateTarget "PrepareXcodeProjectTemplate" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -1681,7 +1581,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SDLiPhoneOS" */ = {
+		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SDL" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				C01FCF4F08A954540054247B /* Debug */,
diff --git a/Xcode-iPhoneOS/SDL/testsdl-Info.plist b/Xcode-iOS/SDL/testsdl-Info.plist
index af9a1cadb6..af9a1cadb6 100644
--- a/Xcode-iPhoneOS/SDL/testsdl-Info.plist
+++ b/Xcode-iOS/SDL/testsdl-Info.plist
diff --git a/Xcode-iPhoneOS/Template/SDL iOS Application/Default.png b/Xcode-iOS/Template/SDL iOS Application/Default.png
index f91282875a..f91282875a 100644
--- a/Xcode-iPhoneOS/Template/SDL iOS Application/Default.png
+++ b/Xcode-iOS/Template/SDL iOS Application/Default.png
diff --git a/Xcode-iPhoneOS/Template/SDL iOS Application/Icon.png b/Xcode-iOS/Template/SDL iOS Application/Icon.png
index 83f4d10a21..83f4d10a21 100644
--- a/Xcode-iPhoneOS/Template/SDL iOS Application/Icon.png
+++ b/Xcode-iOS/Template/SDL iOS Application/Icon.png
diff --git a/Xcode-iPhoneOS/Template/SDL iOS Application/Info.plist b/Xcode-iOS/Template/SDL iOS Application/Info.plist
index b8089dca2d..b8089dca2d 100644
--- a/Xcode-iPhoneOS/Template/SDL iOS Application/Info.plist
+++ b/Xcode-iOS/Template/SDL iOS Application/Info.plist
diff --git a/Xcode-iPhoneOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/TemplateIcon.icns b/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/TemplateIcon.icns
index 4500ce2bbd..4500ce2bbd 100644
--- a/Xcode-iPhoneOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/TemplateIcon.icns
+++ b/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/TemplateIcon.icns
diff --git a/Xcode-iPhoneOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/TemplateInfo.plist b/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/TemplateInfo.plist
index 498e37d4f7..498e37d4f7 100644
--- a/Xcode-iPhoneOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/TemplateInfo.plist
+++ b/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/TemplateInfo.plist
diff --git a/Xcode-iPhoneOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.pbxproj b/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.pbxproj
index f786799eb8..f786799eb8 100755
--- a/Xcode-iPhoneOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.pbxproj
+++ b/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.pbxproj
diff --git a/Xcode-iPhoneOS/Template/SDL iOS Application/main.c b/Xcode-iOS/Template/SDL iOS Application/main.c
index 2a5d3f2ac0..2a5d3f2ac0 100644
--- a/Xcode-iPhoneOS/Template/SDL iOS Application/main.c
+++ b/Xcode-iOS/Template/SDL iOS Application/main.c
diff --git a/Xcode-iPhoneOS/Test/Info.plist b/Xcode-iOS/Test/Info.plist
index c0f1179d35..c0f1179d35 100644
--- a/Xcode-iPhoneOS/Test/Info.plist
+++ b/Xcode-iOS/Test/Info.plist
diff --git a/Xcode-iPhoneOS/Test/README b/Xcode-iOS/Test/README
index b16ff7c0f9..b16ff7c0f9 100644
--- a/Xcode-iPhoneOS/Test/README
+++ b/Xcode-iOS/Test/README
diff --git a/Xcode-iPhoneOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj b/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj
index d55e9f7ddf..d55e9f7ddf 100755
--- a/Xcode-iPhoneOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj
+++ b/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj
diff --git a/include/doxyfile b/include/doxyfile
index 103475527b..46055c7ad4 100644
--- a/include/doxyfile
+++ b/include/doxyfile
@@ -635,7 +635,7 @@ EXCLUDE                = ../doxy \
                          ../Xcode \
                          ../VisualC \
                          ../VisualCE \
-                         ../Xcode-iPhoneOS
+                         ../Xcode-iOS
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
 # directories that are symbolic links (a Unix filesystem feature) are excluded