diff --git a/Xcode/stepmania_xcode4.xcodeproj/project.pbxproj b/Xcode/stepmania_xcode4.xcodeproj/project.pbxproj
index 36f73f5a4b..9c07554a6f 100644
--- a/Xcode/stepmania_xcode4.xcodeproj/project.pbxproj
+++ b/Xcode/stepmania_xcode4.xcodeproj/project.pbxproj
@@ -5873,7 +5873,7 @@
 /* Begin PBXProject section */
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
-			buildConfigurationList = AAC845130856A19700A9FEAB /* Build configuration list for PBXProject "stepmania" */;
+			buildConfigurationList = AAC845130856A19700A9FEAB /* Build configuration list for PBXProject "stepmania_xcode4" */;
 			compatibilityVersion = "Xcode 3.1";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
@@ -7421,50 +7421,6 @@
 			};
 			name = PerformanceDebug;
 		};
-		2B17AB7513980FE0001AE57D /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_PREFIX_HEADER = "";
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
-				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
-				GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
-				GCC_WARN_ABOUT_MISSING_NEWLINE = NO;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = NO;
-				GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
-				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
-				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
-				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = NO;
-				GCC_WARN_MISSING_PARENTHESES = NO;
-				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = NO;
-				GCC_WARN_PROTOTYPE_CONVERSION = NO;
-				GCC_WARN_SHADOW = NO;
-				GCC_WARN_SIGN_COMPARE = NO;
-				GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
-				GCC_WARN_UNDECLARED_SELECTOR = NO;
-				GCC_WARN_UNINITIALIZED_AUTOS = NO;
-				GCC_WARN_UNKNOWN_PRAGMAS = NO;
-				GCC_WARN_UNUSED_FUNCTION = NO;
-				GCC_WARN_UNUSED_LABEL = NO;
-				GCC_WARN_UNUSED_VALUE = NO;
-				GCC_WARN_UNUSED_VARIABLE = NO;
-				HEADER_SEARCH_PATHS = "../extern/libpng/**";
-				INSTALL_PATH = /usr/local/lib;
-				OTHER_LDFLAGS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = "png-1.5.1-sm5";
-				USER_HEADER_SEARCH_PATHS = "";
-			};
-			name = Universal;
-		};
 		2B17AB7613980FE0001AE57D /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -7598,49 +7554,6 @@
 			};
 			name = PerformanceDebug;
 		};
-		2B17ABC313981522001AE57D /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_PREFIX_HEADER = "";
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
-				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
-				GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
-				GCC_WARN_ABOUT_MISSING_NEWLINE = NO;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = NO;
-				GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
-				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
-				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = NO;
-				GCC_WARN_MISSING_PARENTHESES = NO;
-				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = NO;
-				GCC_WARN_PROTOTYPE_CONVERSION = NO;
-				GCC_WARN_SHADOW = NO;
-				GCC_WARN_SIGN_COMPARE = NO;
-				GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
-				GCC_WARN_UNDECLARED_SELECTOR = NO;
-				GCC_WARN_UNINITIALIZED_AUTOS = NO;
-				GCC_WARN_UNKNOWN_PRAGMAS = NO;
-				GCC_WARN_UNUSED_FUNCTION = NO;
-				GCC_WARN_UNUSED_LABEL = NO;
-				GCC_WARN_UNUSED_VALUE = NO;
-				GCC_WARN_UNUSED_VARIABLE = NO;
-				HEADER_SEARCH_PATHS = "../extern/glew-1.5.8/include";
-				INSTALL_PATH = /usr/local/lib;
-				OTHER_LDFLAGS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = "glew-sm5";
-				USER_HEADER_SEARCH_PATHS = "";
-			};
-			name = Universal;
-		};
 		2B17ABC413981522001AE57D /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -7769,47 +7682,6 @@
 			};
 			name = PerformanceDebug;
 		};
-		2B17ABE313981757001AE57D /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_PRECOMPILE_PREFIX_HEADER = "";
-				GCC_PREFIX_HEADER = "";
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
-				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
-				GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
-				GCC_WARN_ABOUT_MISSING_NEWLINE = NO;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = NO;
-				GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
-				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
-				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = NO;
-				GCC_WARN_MISSING_PARENTHESES = NO;
-				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = NO;
-				GCC_WARN_PROTOTYPE_CONVERSION = NO;
-				GCC_WARN_SHADOW = NO;
-				GCC_WARN_SIGN_COMPARE = NO;
-				GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
-				GCC_WARN_UNDECLARED_SELECTOR = NO;
-				GCC_WARN_UNINITIALIZED_AUTOS = NO;
-				GCC_WARN_UNKNOWN_PRAGMAS = NO;
-				GCC_WARN_UNUSED_FUNCTION = NO;
-				GCC_WARN_UNUSED_LABEL = NO;
-				GCC_WARN_UNUSED_VALUE = NO;
-				GCC_WARN_UNUSED_VARIABLE = NO;
-				INSTALL_PATH = /usr/local/lib;
-				OTHER_LDFLAGS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = "pcre-sm5";
-			};
-			name = Universal;
-		};
 		2B17ABE413981757001AE57D /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -7974,13 +7846,11 @@
 				LINKER_DISPLAYS_MANGLED_NAMES = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				MACOSX_DEPLOYMENT_TARGET_i386 = 10.5;
-				MACOSX_DEPLOYMENT_TARGET_ppc = 10.5;
 				ONLY_LINK_ESSENTIAL_SYMBOLS = YES;
 				PREBINDING = NO;
 				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
 				SDKROOT = macosx10.5;
 				SDKROOT_i386 = "";
-				SDKROOT_ppc = "";
 				SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)";
 				STRIP_INSTALLED_PRODUCT = NO;
 				STRIP_STYLE = "non-global";
@@ -8037,55 +7907,6 @@
 			};
 			name = Native;
 		};
-		AA40D52909A08D650068C0D5 /* Universal */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = AA8B8C49091F48C000D14C5F /* product.xcconfig */;
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SRCROOT)/Frameworks",
-					"$(SYSTEM_LIBRARY_DIR)/Frameworks",
-					"$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Versions/Current/Frameworks",
-				);
-				FULL_NAME = "$(PRODUCT_NAME).$(WRAPPER_EXTENSION)";
-				GCC_PREFIX_HEADER = "$(SRCROOT)/../src/archutils/Darwin/StepMania.pch";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					NO_MP3_SUPPORT,
-					WITHOUT_NETWORKING,
-				);
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				HEADER_SEARCH_PATHS = (
-					"$(SRCROOT)/../src",
-					"$(SRCROOT)/Frameworks/ffmpeg.framework/Headers",
-					"$(SRCROOT)/../src/vorbis",
-					"$(SRCROOT)/../src/libjpeg",
-					"$(SRCROOT)/../src/libpng/include",
-					"$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Versions/Current/Frameworks/CarbonCore.framework/Versions/A/Headers",
-				);
-				INFOPLIST_FILE = "Info-StepMania.plist";
-				INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/../src/ProductInfo.h";
-				INFOPLIST_PREPROCESS = YES;
-				INFOPLIST_PREPROCESSOR_DEFINITIONS = "EXECUTABLE_NAME=\"$(PRODUCT_NAME)\"";
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = (
-					"$(SRCROOT)/Libraries",
-					"$(SRCROOT)/build/$(CONFIGURATION)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
-					"\"$(SRCROOT)/../extern/mad-0.15.1b/msvc++/Release\"",
-				);
-				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build\"";
-				OBJROOT = "$(SRCROOT)/build";
-				OTHER_CPLUSPLUSFLAGS = (
-					"-finline-limit=300",
-					"-fconstant-cfstrings",
-					"-fsingle-precision-constant",
-					"-fno-exceptions",
-				);
-				PRODUCT_NAME = "$(value)";
-				SYMROOT = "$(SRCROOT)/..";
-				WRAPPER_EXTENSION = app;
-			};
-			name = Universal;
-		};
 		AA40D52A09A08D660068C0D5 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = AA8B8C49091F48C000D14C5F /* product.xcconfig */;
@@ -8156,25 +7977,6 @@
 			};
 			name = Native;
 		};
-		AA7A2B9B0AE09BA50054C5BA /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_DYNAMIC_NO_PIC = YES;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_PREFIX_HEADER = "";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					LUA_USE_MACOSX,
-					"$(value)",
-				);
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				INSTALL_PATH = "$(HOME)/bin";
-				LIBRARY_SEARCH_PATHS = "$(SRCROOT)/build/$(CONFIGURATION)";
-				OBJROOT = "$(SRCROOT)/build";
-				PRODUCT_NAME = lua;
-				SYMROOT = "$(SRCROOT)/build";
-			};
-			name = Universal;
-		};
 		AA7A2B9C0AE09BA50054C5BA /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -8210,22 +8012,6 @@
 			};
 			name = Native;
 		};
-		AA7A2BBB0AE09D4E0054C5BA /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_DYNAMIC_NO_PIC = YES;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_PREFIX_HEADER = "";
-				GCC_PREPROCESSOR_DEFINITIONS = LUA_USE_MACOSX;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				INSTALL_PATH = "$(HOME)/bin";
-				LIBRARY_SEARCH_PATHS = "$(SRCROOT)/build/$(CONFIGURATION)";
-				OBJROOT = "$(SRCROOT)/build";
-				PRODUCT_NAME = luac;
-				SYMROOT = "$(SRCROOT)/build";
-			};
-			name = Universal;
-		};
 		AA7A2BBC0AE09D4E0054C5BA /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -8249,13 +8035,6 @@
 			};
 			name = Native;
 		};
-		AA7A2BBF0AE09D4E0054C5BA /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				PRODUCT_NAME = "all lua";
-			};
-			name = Universal;
-		};
 		AA7A2BC00AE09D4E0054C5BA /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -8283,22 +8062,6 @@
 			};
 			name = Native;
 		};
-		AA7C89830B67447E00FD9940 /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
-				GCC_DYNAMIC_NO_PIC = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
-				GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
-				GCC_WARN_PROTOTYPE_CONVERSION = NO;
-				INSTALL_PATH = /usr/local/lib;
-				PRODUCT_NAME = "tommath-sm5";
-				SYMROOT = "$(SRCROOT)/build";
-			};
-			name = Universal;
-		};
 		AA7C89840B67447E00FD9940 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -8335,24 +8098,6 @@
 			};
 			name = Native;
 		};
-		AA7C8B900B67464300FD9940 /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
-				DEAD_CODE_STRIPPING = NO;
-				GCC_DYNAMIC_NO_PIC = YES;
-				GCC_ENABLE_CPP_RTTI = NO;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
-				GCC_WARN_PROTOTYPE_CONVERSION = NO;
-				INSTALL_PATH = /usr/local/lib;
-				KEEP_PRIVATE_EXTERNS = YES;
-				PRODUCT_NAME = "tomcrypt-sm5";
-				SYMROOT = "$(SRCROOT)/build";
-			};
-			name = Universal;
-		};
 		AA7C8B910B67464300FD9940 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -8449,43 +8194,6 @@
 			};
 			name = PerformanceDebug;
 		};
-		AAA070AC0CE7B0E2005A3060 /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
-				FPM = "";
-				"FPM[arch=i386]" = FPM_INTEL;
-				"FPM[arch=ppc]" = FPM_PPC;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"HAVE_ASSERT_H=1",
-					"HAVE_DLFCN_H=1",
-					"HAVE_ERRNO_H=1",
-					"HAVE_FORK=1",
-					"HAVE_INTTYPES_H=1",
-					"HAVE_LIMITS_H=1",
-					"HAVE_MEMORY_H=1",
-					"HAVE_WAITPID=1",
-					"SIZEOF_LONG=4",
-					"$(FPM)",
-				);
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
-				GCC_WARN_PROTOTYPE_CONVERSION = NO;
-				GCC_WARN_SHADOW = NO;
-				GCC_WARN_SIGN_COMPARE = NO;
-				HEADER_SEARCH_PATHS = "$(SRCROOT)/../src/mad-0.15.1b";
-				INSTALL_PATH = /usr/local/lib;
-				PREBINDING = NO;
-				PRODUCT_NAME = "mad-sm5";
-			};
-			name = Universal;
-		};
 		AAA070AD0CE7B0E2005A3060 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -8574,13 +8282,11 @@
 				LINKER_DISPLAYS_MANGLED_NAMES = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				MACOSX_DEPLOYMENT_TARGET_i386 = 10.5;
-				MACOSX_DEPLOYMENT_TARGET_ppc = 10.5;
 				ONLY_LINK_ESSENTIAL_SYMBOLS = YES;
 				PREBINDING = NO;
 				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
 				SDKROOT = macosx10.5;
 				SDKROOT_i386 = "";
-				SDKROOT_ppc = "";
 				SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)";
 				STRIP_INSTALLED_PRODUCT = YES;
 				STRIP_STYLE = "non-global";
@@ -8930,13 +8636,11 @@
 				LINKER_DISPLAYS_MANGLED_NAMES = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				MACOSX_DEPLOYMENT_TARGET_i386 = 10.5;
-				MACOSX_DEPLOYMENT_TARGET_ppc = 10.5;
 				ONLY_LINK_ESSENTIAL_SYMBOLS = YES;
 				PREBINDING = NO;
 				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
 				SDKROOT = macosx10.5;
 				SDKROOT_i386 = "";
-				SDKROOT_ppc = "";
 				SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)";
 				STRIP_INSTALLED_PRODUCT = YES;
 				STRIP_STYLE = "non-global";
@@ -8944,138 +8648,6 @@
 			};
 			name = Native;
 		};
-		AAE44A2B0965707500B025E5 /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				DEAD_CODE_STRIPPING = YES;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_OPTIMIZATION_LEVEL = 3;
-				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
-				GCC_WARN_SHADOW = NO;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES;
-				GCC_WARN_UNKNOWN_PRAGMAS = YES;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_LABEL = NO;
-				GCC_WARN_UNUSED_PARAMETER = NO;
-				GCC_WARN_UNUSED_VALUE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				LIBRARY_STYLE = Bundle;
-				MACOSX_DEPLOYMENT_TARGET = 10.5;
-				PRODUCT_NAME = version;
-				ZERO_LINK = NO;
-			};
-			name = Universal;
-		};
-		AAE44A2C0965707500B025E5 /* Universal */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = AA8B8C49091F48C000D14C5F /* product.xcconfig */;
-			buildSettings = {
-				CONFIGURATION_BUILD_DIR = "$(SYMROOT)";
-				FULL_NAME = "$(PRODUCT_NAME).$(WRAPPER_EXTENSION)";
-				GCC_AUTO_VECTORIZATION = NO;
-				GCC_ENABLE_OBJC_EXCEPTIONS = NO;
-				GCC_ENABLE_SSE3_EXTENSIONS = NO;
-				GCC_PREFIX_HEADER = "$(SRCROOT)/../src/archutils/Darwin/StepMania.pch";
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				HEADER_SEARCH_PATHS = (
-					"$(SRCROOT)/../src",
-					"$(SRCROOT)/../src/ffmpeg/include",
-					"$(SRCROOT)/../src/vorbis",
-					"$(SRCROOT)/../src/libjpeg",
-					"$(SRCROOT)/../src/libpng/include",
-				);
-				INFOPLIST_FILE = "Info-StepMania.plist";
-				INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/../src/ProductInfo.h";
-				INFOPLIST_PREPROCESS = YES;
-				INFOPLIST_PREPROCESSOR_DEFINITIONS = "EXECUTABLE_NAME=\"$(PRODUCT_NAME)\"";
-				LIBRARY_SEARCH_PATHS = (
-					"$(SRCROOT)/build/$(CONFIGURATION)",
-					"$(SRCROOT)/Libraries",
-					"\"$(SRCROOT)/../extern/mad-0.15.1b/msvc++/Release\"",
-				);
-				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build\"";
-				LINKER_DISPLAYS_MANGLED_NAMES = NO;
-				OBJROOT = "$(SRCROOT)/build";
-				OTHER_CPLUSPLUSFLAGS = (
-					"-finline-limit=300",
-					"-fconstant-cfstrings",
-					"-fno-exceptions",
-					"-falign-loops=16",
-				);
-				PRODUCT_NAME = StepMania;
-				SYMROOT = "$(SRCROOT)/..";
-				WRAPPER_EXTENSION = app;
-			};
-			name = Universal;
-		};
-		AAE44A2D0965707500B025E5 /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				BUILD_VARIANTS = normal;
-				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)";
-				DEAD_CODE_STRIPPING = YES;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				EXCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = "*.nib *.lproj *.framework *.gch *.xcode* (*) CVS .svn .hg .git";
-				GCC_ALTIVEC_EXTENSIONS = YES;
-				GCC_DEBUGGING_SYMBOLS = full;
-				GCC_DYNAMIC_NO_PIC = YES;
-				GCC_ENABLE_CPP_EXCEPTIONS = NO;
-				GCC_ENABLE_SYMBOL_SEPARATION = NO;
-				GCC_FAST_MATH = NO;
-				GCC_FAST_OBJC_DISPATCH = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 3;
-				GCC_PFE_FILE_C_DIALECTS = "c objective-c c++ objective-c++";
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_STRICT_ALIASING = YES;
-				GCC_UNROLL_LOOPS = YES;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO;
-				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
-				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
-				GCC_WARN_MISSING_PARENTHESES = YES;
-				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
-				GCC_WARN_PROTOTYPE_CONVERSION = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES;
-				GCC_WARN_UNKNOWN_PRAGMAS = YES;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_LABEL = YES;
-				GCC_WARN_UNUSED_VALUE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				LINKER_DISPLAYS_MANGLED_NAMES = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.5;
-				MACOSX_DEPLOYMENT_TARGET_i386 = 10.5;
-				MACOSX_DEPLOYMENT_TARGET_ppc = 10.5;
-				ONLY_LINK_ESSENTIAL_SYMBOLS = YES;
-				PREBINDING = NO;
-				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
-				SDKROOT = macosx10.5;
-				SDKROOT_i386 = "";
-				SDKROOT_ppc = "";
-				SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)";
-				STRIP_INSTALLED_PRODUCT = YES;
-				STRIP_STYLE = "non-global";
-				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../extern/glew-1.5.8/include $(PROJECT_DIR)/../extern/jsoncpp/include";
-			};
-			name = Universal;
-		};
 		AAE781800AC7E3BF00AEFC64 /* Native */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -9102,32 +8674,6 @@
 			};
 			name = Native;
 		};
-		AAE781810AC7E3BF00AEFC64 /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
-				GCC_DEBUGGING_SYMBOLS = full;
-				GCC_DYNAMIC_NO_PIC = YES;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_PREFIX_HEADER = "";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"$(value)",
-					LUA_USE_MACOSX,
-				);
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
-				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
-				GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
-				GCC_WARN_PROTOTYPE_CONVERSION = NO;
-				GCC_WARN_SHADOW = NO;
-				INSTALL_PATH = /usr/local/lib;
-				OBJROOT = "$(SRCROOT)/build";
-				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
-				PRODUCT_NAME = "lua-5.1-sm5";
-				SYMROOT = "$(SRCROOT)/build";
-			};
-			name = Universal;
-		};
 		AAE781820AC7E3BF00AEFC64 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -9162,7 +8708,6 @@
 			buildConfigurations = (
 				2B17AB7313980FE0001AE57D /* Native */,
 				2B17AB7413980FE0001AE57D /* PerformanceDebug */,
-				2B17AB7513980FE0001AE57D /* Universal */,
 				2B17AB7613980FE0001AE57D /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -9173,7 +8718,6 @@
 			buildConfigurations = (
 				2B17ABC113981522001AE57D /* Native */,
 				2B17ABC213981522001AE57D /* PerformanceDebug */,
-				2B17ABC313981522001AE57D /* Universal */,
 				2B17ABC413981522001AE57D /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -9184,7 +8728,6 @@
 			buildConfigurations = (
 				2B17ABE113981757001AE57D /* Native */,
 				2B17ABE213981757001AE57D /* PerformanceDebug */,
-				2B17ABE313981757001AE57D /* Universal */,
 				2B17ABE413981757001AE57D /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -9195,7 +8738,6 @@
 			buildConfigurations = (
 				AA40D52809A08D650068C0D5 /* Native */,
 				AABF4DBD0CD37960005A3060 /* PerformanceDebug */,
-				AA40D52909A08D650068C0D5 /* Universal */,
 				AA40D52A09A08D660068C0D5 /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -9206,7 +8748,6 @@
 			buildConfigurations = (
 				AA7A2B9A0AE09BA50054C5BA /* Native */,
 				AABF4DBF0CD37960005A3060 /* PerformanceDebug */,
-				AA7A2B9B0AE09BA50054C5BA /* Universal */,
 				AA7A2B9C0AE09BA50054C5BA /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -9217,7 +8758,6 @@
 			buildConfigurations = (
 				AA7A2BBA0AE09D4E0054C5BA /* Native */,
 				AABF4DC00CD37960005A3060 /* PerformanceDebug */,
-				AA7A2BBB0AE09D4E0054C5BA /* Universal */,
 				AA7A2BBC0AE09D4E0054C5BA /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -9228,7 +8768,6 @@
 			buildConfigurations = (
 				AA7A2BBE0AE09D4E0054C5BA /* Native */,
 				AABF4DC10CD37960005A3060 /* PerformanceDebug */,
-				AA7A2BBF0AE09D4E0054C5BA /* Universal */,
 				AA7A2BC00AE09D4E0054C5BA /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -9239,7 +8778,6 @@
 			buildConfigurations = (
 				AA7C89820B67447E00FD9940 /* Native */,
 				AABF4DC20CD37960005A3060 /* PerformanceDebug */,
-				AA7C89830B67447E00FD9940 /* Universal */,
 				AA7C89840B67447E00FD9940 /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -9250,7 +8788,6 @@
 			buildConfigurations = (
 				AA7C8B8F0B67464300FD9940 /* Native */,
 				AABF4DC30CD37960005A3060 /* PerformanceDebug */,
-				AA7C8B900B67464300FD9940 /* Universal */,
 				AA7C8B910B67464300FD9940 /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -9261,7 +8798,6 @@
 			buildConfigurations = (
 				AAA070AA0CE7B0E2005A3060 /* Native */,
 				AAA070AB0CE7B0E2005A3060 /* PerformanceDebug */,
-				AAA070AC0CE7B0E2005A3060 /* Universal */,
 				AAA070AD0CE7B0E2005A3060 /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -9272,7 +8808,6 @@
 			buildConfigurations = (
 				AAC8450D0856A19700A9FEAB /* Native */,
 				AABF4DBC0CD37960005A3060 /* PerformanceDebug */,
-				AAE44A2B0965707500B025E5 /* Universal */,
 				AA0AA8FE0963CF7700427F4D /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -9283,18 +8818,16 @@
 			buildConfigurations = (
 				AAC845110856A19700A9FEAB /* Native */,
 				AABF4DBB0CD37960005A3060 /* PerformanceDebug */,
-				AAE44A2C0965707500B025E5 /* Universal */,
 				AA0AA8FF0963CF7700427F4D /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Native;
 		};
-		AAC845130856A19700A9FEAB /* Build configuration list for PBXProject "stepmania" */ = {
+		AAC845130856A19700A9FEAB /* Build configuration list for PBXProject "stepmania_xcode4" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				AAC845150856A19700A9FEAB /* Native */,
 				AABF4DBA0CD37960005A3060 /* PerformanceDebug */,
-				AAE44A2D0965707500B025E5 /* Universal */,
 				AA0AA9000963CF7700427F4D /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -9305,7 +8838,6 @@
 			buildConfigurations = (
 				AAE781800AC7E3BF00AEFC64 /* Native */,
 				AABF4DBE0CD37960005A3060 /* PerformanceDebug */,
-				AAE781810AC7E3BF00AEFC64 /* Universal */,
 				AAE781820AC7E3BF00AEFC64 /* Debug */,
 			);
 			defaultConfigurationIsVisible = 0;