diff --git a/stepmania/PBProject/Libraries/Libraries.xcode/project.pbxproj b/stepmania/PBProject/Libraries/Libraries.xcode/project.pbxproj index 30fe9a86d6..a120e3924f 100644 --- a/stepmania/PBProject/Libraries/Libraries.xcode/project.pbxproj +++ b/stepmania/PBProject/Libraries/Libraries.xcode/project.pbxproj @@ -425,6 +425,38 @@ outputFiles = ( ); }; + AAD5214A0954F8B500073D86 /* PBXBuildRule */ = { + isa = PBXBuildRule; + compilerSpec = com.apple.compilers.gcc.3_3; + fileType = sourcecode.c; + isEditable = 1; + outputFiles = ( + ); + }; + AAD5214B0954F8C000073D86 /* PBXBuildRule */ = { + isa = PBXBuildRule; + compilerSpec = com.apple.compilers.gcc.3_3; + fileType = sourcecode.asm; + isEditable = 1; + outputFiles = ( + ); + }; + AAD521660954FBA600073D86 /* PBXBuildRule */ = { + isa = PBXBuildRule; + compilerSpec = com.apple.compilers.gcc.3_3; + fileType = sourcecode.c; + isEditable = 1; + outputFiles = ( + ); + }; + AAD521670954FBAC00073D86 /* PBXBuildRule */ = { + isa = PBXBuildRule; + compilerSpec = com.apple.compilers.gcc.3_3; + fileType = sourcecode.asm; + isEditable = 1; + outputFiles = ( + ); + }; /* End PBXBuildRule section */ /* Begin PBXBuildStyle section */ @@ -687,7 +719,6 @@ AAA3730E090994F500141131 /* mad.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = mad.framework; sourceTree = BUILT_PRODUCTS_DIR; }; AAA3730F090994F500141131 /* mad-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "mad-Info.plist"; sourceTree = ""; }; AAA37354090998C400141131 /* resample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = resample.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - AAA37355090998C500141131 /* resample-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "resample-Info.plist"; sourceTree = ""; }; AAA37365090998F700141131 /* libresample.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = libresample.h; sourceTree = ""; }; AAA3736D090998F700141131 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = ""; }; AAA3736F090998F700141131 /* filterkit.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = filterkit.c; sourceTree = ""; }; @@ -913,7 +944,6 @@ 0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */, 034768DDFF38A45A11DB9C8B /* Products */, AAA3730F090994F500141131 /* mad-Info.plist */, - AAA37355090998C500141131 /* resample-Info.plist */, ); name = Libraries; sourceTree = ""; @@ -1910,6 +1940,8 @@ AAA3730C090994F500141131 /* Frameworks */, ); buildRules = ( + AAD521670954FBAC00073D86 /* PBXBuildRule */, + AAD521660954FBA600073D86 /* PBXBuildRule */, ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; @@ -1977,6 +2009,8 @@ AAA37352090998C400141131 /* Frameworks */, ); buildRules = ( + AAD5214B0954F8C000073D86 /* PBXBuildRule */, + AAD5214A0954F8B500073D86 /* PBXBuildRule */, ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; @@ -2396,10 +2430,14 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; + GCC_FAST_MATH = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 3; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = FPM_PPC; + GCC_UNROLL_LOOPS = YES; GCC_USE_GCC3_PFE_SUPPORT = YES; INFOPLIST_FILE = "mad-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; @@ -2433,11 +2471,6 @@ GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; INFOPLIST_FILE = "resample-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(SRCROOT)/libresample", - "$(SRCROOT)/libresample/xboxresample/Debug", - "$(SRCROOT)/libresample/xboxresample/Release", - ); OPTIMIZATION_CFLAGS = "-O0"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( diff --git a/stepmania/PBProject/stepmania.pbproj/project.pbxproj b/stepmania/PBProject/stepmania.pbproj/project.pbxproj index a10446f9e3..2d3f6368dd 100755 --- a/stepmania/PBProject/stepmania.pbproj/project.pbxproj +++ b/stepmania/PBProject/stepmania.pbproj/project.pbxproj @@ -267,7 +267,6 @@ AA29CCE10558741A00961A51 /* ThemeManager.h in Headers */ = {isa = PBXBuildFile; fileRef = AA6E01130477128A005F316C /* ThemeManager.h */; }; AA29CCE30558741A00961A51 /* RageSoundDriver_Null.h in Headers */ = {isa = PBXBuildFile; fileRef = AA6E012F047712BE005F316C /* RageSoundDriver_Null.h */; }; AA29CCE50558741A00961A51 /* LowLevelWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = AA6E01630477136A005F316C /* LowLevelWindow.h */; }; - AA29CCE60558741A00961A51 /* LowLevelWindow_SDL.h in Headers */ = {isa = PBXBuildFile; fileRef = AA6E01650477136A005F316C /* LowLevelWindow_SDL.h */; }; AA29CCE70558741A00961A51 /* SongCacheIndex.h in Headers */ = {isa = PBXBuildFile; fileRef = AA6E01DF04772005005F316C /* SongCacheIndex.h */; }; AA29CCE80558741A00961A51 /* song.h in Headers */ = {isa = PBXBuildFile; fileRef = AA6E01E30477205A005F316C /* song.h */; }; AA29CCE90558741A00961A51 /* RandomSample.h in Headers */ = {isa = PBXBuildFile; fileRef = AA6E01E7047720A3005F316C /* RandomSample.h */; }; @@ -485,7 +484,6 @@ AA29CDEF0558741A00961A51 /* ThemeManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E01120477128A005F316C /* ThemeManager.cpp */; }; AA29CDF10558741A00961A51 /* RageSoundDriver_Null.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E012E047712BE005F316C /* RageSoundDriver_Null.cpp */; }; AA29CDF20558741A00961A51 /* arch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E01410477136A005F316C /* arch.cpp */; }; - AA29CDF40558741A00961A51 /* LowLevelWindow_SDL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E01640477136A005F316C /* LowLevelWindow_SDL.cpp */; }; AA29CDF50558741A00961A51 /* MovieTexture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E01DB04771F11005F316C /* MovieTexture.cpp */; }; AA29CDF60558741A00961A51 /* SongCacheIndex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E01DE04772005005F316C /* SongCacheIndex.cpp */; }; AA29CDF70558741A00961A51 /* Song.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E01E20477205A005F316C /* Song.cpp */; }; @@ -551,6 +549,8 @@ AA29CE420558741A00961A51 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAF33F2A04FF213100F93C24 /* CoreFoundation.framework */; }; AA2FB62A09120FC5000FD574 /* PreferredLanguage.m in Sources */ = {isa = PBXBuildFile; fileRef = AA2FB62909120FC5000FD574 /* PreferredLanguage.m */; }; AA2FB639091212B0000FD574 /* LifeMeter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA2FB638091212AF000FD574 /* LifeMeter.cpp */; }; + AA32F97E096A255500F45B24 /* LowLevelWindow_Cocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = AAEF7D21090DD45900A1CAFC /* LowLevelWindow_Cocoa.h */; }; + AA32F97F096A255C00F45B24 /* LowLevelWindow_Cocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = AAEF7D22090DD45900A1CAFC /* LowLevelWindow_Cocoa.mm */; }; AA34ECF70611C9A7003E5955 /* CAAudioHardwareStream.h in Headers */ = {isa = PBXBuildFile; fileRef = AAF744B306116B0500B19AD1 /* CAAudioHardwareStream.h */; }; AA34ECF80611C9A8003E5955 /* CAAudioHardwareStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAF744B206116B0500B19AD1 /* CAAudioHardwareStream.cpp */; }; AA34ECF90611C9A9003E5955 /* CAAudioHardwareDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = AAF744B106116B0500B19AD1 /* CAAudioHardwareDevice.h */; }; @@ -681,6 +681,9 @@ AA8BD2C407C939F800EA04E1 /* ScoreDisplayCalories.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA8BD2BD07C939F800EA04E1 /* ScoreDisplayCalories.cpp */; }; AA8BD2C507C939F800EA04E1 /* ScoreDisplayCalories.h in Headers */ = {isa = PBXBuildFile; fileRef = AA8BD2BE07C939F800EA04E1 /* ScoreDisplayCalories.h */; }; AA8BD2C707C93A1E00EA04E1 /* CommonMetrics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA8BD2C607C93A1E00EA04E1 /* CommonMetrics.cpp */; }; + AA8E4BC709787C9400765149 /* ControllerStateDisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA8E4BC409787C9400765149 /* ControllerStateDisplay.cpp */; }; + AA8E4BC809787C9500765149 /* ControllerStateDisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = AA8E4BC509787C9400765149 /* ControllerStateDisplay.h */; }; + AA8E4BC909787C9500765149 /* MenuInput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA8E4BC609787C9400765149 /* MenuInput.cpp */; }; AA8E55AC090B7F3800D8CD2D /* libvorbisfile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AAA3791509099AE200141131 /* libvorbisfile.a */; }; AA8E55AD090B7F3C00D8CD2D /* libvorbis.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AAA3791409099AE200141131 /* libvorbis.a */; }; AA8E55AE090B7F4000D8CD2D /* libogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AAA378E809099AE100141131 /* libogg.a */; }; @@ -688,7 +691,6 @@ AA8E5635090B910C00D8CD2D /* resample.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AA8E5629090B90D200D8CD2D /* resample.framework */; }; AA8EE0760866E266002C51A7 /* LuaBinding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA8EE0750866E266002C51A7 /* LuaBinding.cpp */; }; AA8F13710624BAB200C6A467 /* EnumHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = AA8F136F0624BAB200C6A467 /* EnumHelper.h */; }; - AA8FFBB60972115300667FD4 /* MenuInput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA8FFBB50972115200667FD4 /* MenuInput.cpp */; }; AA9091A1067ED43000C1FCFF /* RageSurface_Load_BMP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA90919F067ED43000C1FCFF /* RageSurface_Load_BMP.cpp */; }; AA9091A2067ED43000C1FCFF /* RageSurface_Load_BMP.h in Headers */ = {isa = PBXBuildFile; fileRef = AA9091A0067ED43000C1FCFF /* RageSurface_Load_BMP.h */; }; AA9091A5067ED46400C1FCFF /* RageSurface_Save_BMP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA9091A3067ED46400C1FCFF /* RageSurface_Save_BMP.cpp */; }; @@ -884,37 +886,8 @@ AAFBEEF0094D807E000029DE /* ScreenServiceAction.h in Headers */ = {isa = PBXBuildFile; fileRef = AAFBEEEA094D807E000029DE /* ScreenServiceAction.h */; }; AAFC6CF1072A30440053AAD3 /* InputHandler_MonkeyKeyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAFC6CEF072A30440053AAD3 /* InputHandler_MonkeyKeyboard.cpp */; }; AAFC6CF2072A30440053AAD3 /* InputHandler_MonkeyKeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = AAFC6CF0072A30440053AAD3 /* InputHandler_MonkeyKeyboard.h */; }; - AAFFB3D90971F28700BC9CF2 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = AAFFB3D80971F28700BC9CF2 /* Localizable.strings */; }; /* End PBXBuildFile section */ -/* Begin PBXBuildRule section */ - AA4B42D905736AB5005FB5DB /* PBXBuildRule */ = { - isa = PBXBuildRule; - compilerSpec = com.apple.compilers.gcc.3_3; - filePatterns = .mm; - fileType = pattern.proxy; - isEditable = 1; - outputFiles = ( - ); - }; - AA77E79D08B6573200FA24CA /* PBXBuildRule */ = { - isa = PBXBuildRule; - compilerSpec = com.apple.compilers.gcc.3_3; - fileType = sourcecode.c; - isEditable = 1; - outputFiles = ( - ); - }; - AA77E79E08B6574300FA24CA /* PBXBuildRule */ = { - isa = PBXBuildRule; - compilerSpec = com.apple.compilers.gcc.3_3; - fileType = sourcecode.asm; - isEditable = 1; - outputFiles = ( - ); - }; -/* End PBXBuildRule section */ - /* Begin PBXBuildStyle section */ 4A9504CCFFE6A4B311CA0CBA /* Development */ = { isa = PBXBuildStyle; @@ -1130,13 +1103,13 @@ AA4B425805733D71005FB5DB /* mad.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = mad.framework; path = Frameworks/mad.framework; sourceTree = SOURCE_ROOT; }; AA4B4737057396D3005FB5DB /* ffmpeg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ffmpeg.framework; path = Frameworks/ffmpeg.framework; sourceTree = SOURCE_ROOT; }; AA4B4784057396F8005FB5DB /* SDL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL.framework; path = Frameworks/SDL.framework; sourceTree = SOURCE_ROOT; }; - AA4B59EE0573AA5B005FB5DB /* SMMain.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; name = SMMain.mm; path = ../PBProject/SMMain.mm; sourceTree = ""; tabWidth = 4; usesTabs = 1; }; + AA4B59EE0573AA5B005FB5DB /* SMMain.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = SMMain.mm; sourceTree = SOURCE_ROOT; tabWidth = 4; usesTabs = 1; }; AA4B5CC40573AD81005FB5DB /* wchar.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 4; path = wchar.cpp; sourceTree = ""; tabWidth = 4; usesTabs = 1; }; AA4F38C004E2D0B700D02EE9 /* NoteDataUtil.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = NoteDataUtil.cpp; path = ../src/NoteDataUtil.cpp; sourceTree = ""; tabWidth = 4; usesTabs = 1; }; AA4F38C104E2D0B700D02EE9 /* NoteDataUtil.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = NoteDataUtil.h; path = ../src/NoteDataUtil.h; sourceTree = ""; tabWidth = 4; usesTabs = 1; }; AA50201D05D6D7B200ACEFD0 /* Profile.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = Profile.cpp; path = ../src/Profile.cpp; sourceTree = ""; usesTabs = 1; }; AA50201E05D6D7B200ACEFD0 /* Profile.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = Profile.h; path = ../src/Profile.h; sourceTree = ""; usesTabs = 1; }; - AA52E9BD04DBBCF400D02EE9 /* ver.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = ver.cpp; path = ../PBProject/ver.cpp; sourceTree = ""; tabWidth = 4; usesTabs = 1; }; + AA52E9BD04DBBCF400D02EE9 /* ver.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; path = ver.cpp; sourceTree = ""; tabWidth = 4; usesTabs = 1; }; AA53D28405277DAF00D02EE9 /* ScreenOptionsMaster.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = ScreenOptionsMaster.cpp; path = ../src/ScreenOptionsMaster.cpp; sourceTree = ""; tabWidth = 4; usesTabs = 1; }; AA53D28505277DAF00D02EE9 /* ScreenOptionsMaster.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = ScreenOptionsMaster.h; path = ../src/ScreenOptionsMaster.h; sourceTree = ""; tabWidth = 4; usesTabs = 1; }; AA53D28605277DAF00D02EE9 /* ScreenOptionsMasterPrefs.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = ScreenOptionsMasterPrefs.cpp; path = ../src/ScreenOptionsMasterPrefs.cpp; sourceTree = ""; tabWidth = 4; usesTabs = 1; }; @@ -1588,13 +1561,15 @@ AA8BD2BE07C939F800EA04E1 /* ScoreDisplayCalories.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ScoreDisplayCalories.h; path = ../src/ScoreDisplayCalories.h; sourceTree = ""; }; AA8BD2C607C93A1E00EA04E1 /* CommonMetrics.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = CommonMetrics.cpp; path = ../src/CommonMetrics.cpp; sourceTree = ""; }; AA8DD84904A2E51400D02EE9 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = ""; }; + AA8E4BC409787C9400765149 /* ControllerStateDisplay.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ControllerStateDisplay.cpp; path = ../src/ControllerStateDisplay.cpp; sourceTree = SOURCE_ROOT; }; + AA8E4BC509787C9400765149 /* ControllerStateDisplay.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ControllerStateDisplay.h; path = ../src/ControllerStateDisplay.h; sourceTree = SOURCE_ROOT; }; + AA8E4BC609787C9400765149 /* MenuInput.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = MenuInput.cpp; path = ../src/MenuInput.cpp; sourceTree = SOURCE_ROOT; }; AA8E5629090B90D200D8CD2D /* resample.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = resample.framework; path = Frameworks/resample.framework; sourceTree = ""; }; AA8EE0750866E266002C51A7 /* LuaBinding.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = LuaBinding.cpp; path = ../src/LuaBinding.cpp; sourceTree = ""; }; AA8F118204A04F9B00D02EE9 /* DifficultyDisplay.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; indentWidth = 4; name = DifficultyDisplay.cpp; path = ../src/DifficultyDisplay.cpp; sourceTree = ""; tabWidth = 4; usesTabs = 1; }; AA8F118304A04F9B00D02EE9 /* DifficultyDisplay.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; indentWidth = 4; name = DifficultyDisplay.h; path = ../src/DifficultyDisplay.h; sourceTree = ""; tabWidth = 4; usesTabs = 1; }; AA8F136E0624BAB200C6A467 /* EnumHelper.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = EnumHelper.cpp; path = ../src/EnumHelper.cpp; sourceTree = ""; usesTabs = 1; }; AA8F136F0624BAB200C6A467 /* EnumHelper.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = EnumHelper.h; path = ../src/EnumHelper.h; sourceTree = ""; usesTabs = 1; }; - AA8FFBB50972115200667FD4 /* MenuInput.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = MenuInput.cpp; path = ../src/MenuInput.cpp; sourceTree = ""; }; AA90919F067ED43000C1FCFF /* RageSurface_Load_BMP.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = RageSurface_Load_BMP.cpp; path = ../src/RageSurface_Load_BMP.cpp; sourceTree = ""; }; AA9091A0067ED43000C1FCFF /* RageSurface_Load_BMP.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = RageSurface_Load_BMP.h; path = ../src/RageSurface_Load_BMP.h; sourceTree = ""; }; AA9091A3067ED46400C1FCFF /* RageSurface_Save_BMP.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = RageSurface_Save_BMP.cpp; path = ../src/RageSurface_Save_BMP.cpp; sourceTree = ""; }; @@ -1905,8 +1880,6 @@ AAFF55220549F43A00D02EE9 /* ComboGraph.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = ComboGraph.h; path = ../src/ComboGraph.h; sourceTree = ""; tabWidth = 4; usesTabs = 1; }; AAFF5541054E736D00D02EE9 /* Attack.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = Attack.cpp; path = ../src/Attack.cpp; sourceTree = ""; tabWidth = 4; usesTabs = 1; }; AAFF5542054E736D00D02EE9 /* Attack.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = Attack.h; path = ../src/Attack.h; sourceTree = ""; tabWidth = 4; usesTabs = 1; }; - AAFFB3D60971F27A00BC9CF2 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = ""; }; - AAFFB3DA0971F29A00BC9CF2 /* Japanese */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Japanese; path = Japanese.lproj/Localizable.strings; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1988,19 +1961,20 @@ AA6EFF7404770F8B005F316C /* Actors */, AA6EFEFA04770E84005F316C /* ActorsInGameplay */, AA6EFE6D04770D3E005F316C /* ActorsInMenus */, + AA6E01400477136A005F316C /* arch */, + AA6E017E0477136A005F316C /* archutils */, AAE66F620657634D002E3AD9 /* crypto */, AA4E8F5D05E6090F0091C1A8 /* crypto51 */, AA6EFDC804770AF1005F316C /* DataStructures */, AA6EFE5704770C7E005F316C /* FileTypes */, AA6E00FE047711FF005F316C /* GlobalSingletons */, - AA6E01400477136A005F316C /* arch */, - AA6E017E0477136A005F316C /* archutils */, - AA8B6C7804AFD82B00D02EE9 /* pcre */, 29B97315FDCFA39411CA2CEA /* Other Source */, + AA8B6C7804AFD82B00D02EE9 /* pcre */, AA6EFDBB04770A83005F316C /* Rage */, AA6E00090477103E005F316C /* Screens */, AA6EFE6A04770D01005F316C /* StepMania */, AA6EFF6F04770F6A005F316C /* Transitions */, + AA52E9BD04DBBCF400D02EE9 /* ver.cpp */, AA29CE570558741A00961A51 /* Info-StepMania.plist */, AAA3741C09099ADA00141131 /* Libraries */, 29B97323FDCFA39411CA2CEA /* Frameworks */, @@ -2017,8 +1991,6 @@ AA082E9D0653C7E6001A3A80 /* CryptHelpers.cpp */, AA082E9E0653C7E6001A3A80 /* CryptHelpers.h */, AA70E3640663112800DAE1FD /* Foreach.h */, - AA4B59EE0573AA5B005FB5DB /* SMMain.mm */, - AA52E9BD04DBBCF400D02EE9 /* ver.cpp */, ); name = "Other Source"; path = ../src; @@ -2027,7 +1999,6 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( - AAFFB3D80971F28700BC9CF2 /* Localizable.strings */, AAB895E504A9057100D02EE9 /* smicon.icns */, AA817DF70622889500EA44DB /* splash.png */, ); @@ -2659,7 +2630,7 @@ AAEA090605E23DF900D38622 /* LuaFunctions.h */, AA6EFDE304770C79005F316C /* LyricsLoader.cpp */, AA6EFDE404770C79005F316C /* LyricsLoader.h */, - AA8FFBB50972115200667FD4 /* MenuInput.cpp */, + AA8E4BC609787C9400765149 /* MenuInput.cpp */, AA1DCB6304A4872700D02EE9 /* MenuInput.h */, AA6EFDE504770C79005F316C /* NoteData.cpp */, AA6EFDE604770C79005F316C /* NoteData.h */, @@ -2769,6 +2740,7 @@ AAA71EA005EE154E00D2E8FF /* global.cpp */, AA6EFE6004770CF7005F316C /* global.h */, AAADA4AE04E5F3DE00D02EE9 /* ProductInfo.h */, + AA4B59EE0573AA5B005FB5DB /* SMMain.mm */, AAFBEECF094D7FCB000029DE /* SpecialFiles.cpp */, AAFBEED0094D7FCB000029DE /* SpecialFiles.h */, AA6EFE6204770CF7005F316C /* StdString.h */, @@ -2967,6 +2939,8 @@ AA8BD2B007C9395400EA04E1 /* AutoActor.h */, AA6EFFB904770FFD005F316C /* BitmapText.cpp */, AA6EFFBA04770FFD005F316C /* BitmapText.h */, + AA8E4BC409787C9400765149 /* ControllerStateDisplay.cpp */, + AA8E4BC509787C9400765149 /* ControllerStateDisplay.h */, AA8F118204A04F9B00D02EE9 /* DifficultyDisplay.cpp */, AA8F118304A04F9B00D02EE9 /* DifficultyDisplay.h */, AAF3442908F1C36A0006EDB7 /* DynamicActorScroller.cpp */, @@ -3337,7 +3311,6 @@ AA29CCE10558741A00961A51 /* ThemeManager.h in Headers */, AA29CCE30558741A00961A51 /* RageSoundDriver_Null.h in Headers */, AA29CCE50558741A00961A51 /* LowLevelWindow.h in Headers */, - AA29CCE60558741A00961A51 /* LowLevelWindow_SDL.h in Headers */, AA29CCE70558741A00961A51 /* SongCacheIndex.h in Headers */, AA29CCE80558741A00961A51 /* song.h in Headers */, AA29CCE90558741A00961A51 /* RandomSample.h in Headers */, @@ -3619,6 +3592,8 @@ AA07328F0954381800F396C5 /* DisplayResolutions.h in Headers */, AA0732910954381800F396C5 /* XmlFileUtil.h in Headers */, AADD1CC6095C233F0088C9DF /* LocalizedString.h in Headers */, + AA32F97E096A255500F45B24 /* LowLevelWindow_Cocoa.h in Headers */, + AA8E4BC809787C9500765149 /* ControllerStateDisplay.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3656,9 +3631,6 @@ AA29CE3B0558741A00961A51 /* Frameworks */, ); buildRules = ( - AA77E79E08B6574300FA24CA /* PBXBuildRule */, - AA77E79D08B6573200FA24CA /* PBXBuildRule */, - AA4B42D905736AB5005FB5DB /* PBXBuildRule */, ); buildSettings = { FRAMEWORK_SEARCH_PATHS = ( @@ -3757,7 +3729,6 @@ files = ( AA29CD3E0558741A00961A51 /* smicon.icns in Resources */, AA817DF80622889500EA44DB /* splash.png in Resources */, - AAFFB3D90971F28700BC9CF2 /* Localizable.strings in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3938,7 +3909,6 @@ AA29CDEF0558741A00961A51 /* ThemeManager.cpp in Sources */, AA29CDF10558741A00961A51 /* RageSoundDriver_Null.cpp in Sources */, AA29CDF20558741A00961A51 /* arch.cpp in Sources */, - AA29CDF40558741A00961A51 /* LowLevelWindow_SDL.cpp in Sources */, AA29CDF50558741A00961A51 /* MovieTexture.cpp in Sources */, AA29CDF60558741A00961A51 /* SongCacheIndex.cpp in Sources */, AA29CDF70558741A00961A51 /* Song.cpp in Sources */, @@ -4185,7 +4155,9 @@ AA0732900954381800F396C5 /* XmlFileUtil.cpp in Sources */, AAD5219C095513DA00073D86 /* XmlFile.cpp in Sources */, AADD1CC5095C233F0088C9DF /* LocalizedString.cpp in Sources */, - AA8FFBB60972115300667FD4 /* MenuInput.cpp in Sources */, + AA32F97F096A255C00F45B24 /* LowLevelWindow_Cocoa.mm in Sources */, + AA8E4BC709787C9400765149 /* ControllerStateDisplay.cpp in Sources */, + AA8E4BC909787C9500765149 /* MenuInput.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4199,18 +4171,6 @@ }; /* End PBXTargetDependency section */ -/* Begin PBXVariantGroup section */ - AAFFB3D80971F28700BC9CF2 /* Localizable.strings */ = { - isa = PBXVariantGroup; - children = ( - AAFFB3D60971F27A00BC9CF2 /* English */, - AAFFB3DA0971F29A00BC9CF2 /* Japanese */, - ); - name = Localizable.strings; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - /* Begin XCBuildConfiguration section */ AA0AA8FE0963CF7700427F4D /* Debug */ = { isa = XCBuildConfiguration; @@ -4347,6 +4307,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_STRICT_ALIASING = YES; GCC_UNROLL_LOOPS = YES; + GCC_VERSION = 3.3; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_SIGN_COMPARE = YES; @@ -4490,6 +4451,7 @@ GCC_OPTIMIZATION_LEVEL = 3; GCC_STRICT_ALIASING = YES; GCC_UNROLL_LOOPS = YES; + GCC_VERSION = 3.3; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_SIGN_COMPARE = YES; @@ -4498,6 +4460,158 @@ }; name = .; }; + 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.2; + PRODUCT_NAME = version; + ZERO_LINK = NO; + }; + name = Universal; + }; + AAE44A2C0965707500B025E5 /* Universal */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = AA8B8C49091F48C000D14C5F /* product.xcconfig */; + buildSettings = { + COPY_PHASE_STRIP = YES; + DEAD_CODE_STRIPPING = YES; + 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_ENABLE_CPP_RTTI = YES; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_FAST_OBJC_DISPATCH = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_INPUT_FILETYPE = automatic; + GCC_MODEL_TUNING = G4; + GCC_OPTIMIZATION_LEVEL = 3; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SRCROOT)/../src/archutils/Darwin/StepMania.pch"; + GCC_PREPROCESSOR_DEFINITIONS = ( + PBBUILD, + "SM_PCH=TRUE", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_USE_GCC3_PFE_SUPPORT = NO; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + GCC_WARN_CHECK_SWITCH_STATEMENTS = NO; + GCC_WARN_FOUR_CHARACTER_CONSTANTS = 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_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 = YES; + GCC_WARN_UNUSED_PARAMETER = NO; + GCC_WARN_UNUSED_VALUE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../src", + "$(SRCROOT)/Frameworks/SDL.framework/Headers", + "$(SRCROOT)/Frameworks/ffmpeg.framework/Headers", + "$(SRCROOT)/Frameworks/mad.framework/Headers", + "$(SRCROOT)/Frameworks/resample.framework/Headers", + "$(SRCROOT)/../src/lua-5.0/include", + "$(SRCROOT)/../src/vorbis", + "$(SRCROOT)/../src/libjpeg", + "$(SRCROOT)/../src/libpng/include", + "$(SRCROOT)/../src/archutils/Darwin/PublicUtility", + "$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Versions/Current/Frameworks/CarbonCore.framework/Versions/A/Headers", + "$(SDKROOT)/usr/include", + ); + 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 = ( + "$(SDKROOT)/usr/lib", + "$(SRCROOT)/../src/libresample", + "$(SRCROOT)/Libraries", + ); + LIBRARY_STYLE = Bundle; + MACOSX_DEPLOYMENT_TARGET = 10.2; + OBJROOT = "$(SRCROOT)/build"; + OTHER_CFLAGS = ""; + OTHER_CPLUSPLUSFLAGS = ( + "-finline-limit=450", + "-fconstant-cfstrings", + "-fgcse-sm", + "-fprefetch-loop-arrays", + "-fsingle-precision-constant", + "-falign-jumps", + "-falign-loops", + ); + OTHER_LDFLAGS = ( + "-lz", + "-lstdc++", + "-bind_at_load", + "-L$(SRCROOT)/Libraries", + ); + PRODUCT_NAME = "$(value)"; + SECTORDER_FLAGS = ""; + SYMROOT = "$(SRCROOT)/.."; + WARNING_CFLAGS = ""; + WRAPPER_EXTENSION = app; + ZERO_LINK = NO; + }; + name = Universal; + }; + AAE44A2D0965707500B025E5 /* Universal */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = ( + i386, + ppc, + ); + BUILD_VARIANTS = normal; + GCC_FAST_MATH = YES; + GCC_FAST_OBJC_DISPATCH = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_INLINES_ARE_PRIVATE_EXTERN = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_STRICT_ALIASING = YES; + GCC_UNROLL_LOOPS = YES; + GCC_VERSION_i386 = 4.0; + GCC_VERSION_ppc = 3.3; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; + GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; + GCC_WARN_SIGN_COMPARE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.2; + MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; + MACOSX_DEPLOYMENT_TARGET_ppc = 10.2; + SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT_ppc = /Developer/SDKs/MacOSX10.2.8.sdk; + }; + name = Universal; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -4505,6 +4619,7 @@ isa = XCConfigurationList; buildConfigurations = ( AAC8450D0856A19700A9FEAB /* . */, + AAE44A2B0965707500B025E5 /* Universal */, AA0AA8FE0963CF7700427F4D /* Debug */, ); defaultConfigurationIsVisible = 0; @@ -4514,6 +4629,7 @@ isa = XCConfigurationList; buildConfigurations = ( AAC845110856A19700A9FEAB /* . */, + AAE44A2C0965707500B025E5 /* Universal */, AA0AA8FF0963CF7700427F4D /* Debug */, ); defaultConfigurationIsVisible = 0; @@ -4523,6 +4639,7 @@ isa = XCConfigurationList; buildConfigurations = ( AAC845150856A19700A9FEAB /* . */, + AAE44A2D0965707500B025E5 /* Universal */, AA0AA9000963CF7700427F4D /* Debug */, ); defaultConfigurationIsVisible = 0;