From 27b7ee9941234aacc46d7bbc8aaa049e2ed81ce7 Mon Sep 17 00:00:00 2001 From: eddie-0815 Date: Sun, 24 Feb 2008 08:25:32 +0000 Subject: Fixed compilation on Mac OS X (XCode). git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@885 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Classes/UTexture.pas | 4 +- .../MacOSX/UltraStarDX.xcodeproj/eddie.mode1v3 | 240 ++++----------------- .../MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser | 221 ++++++------------- .../MacOSX/UltraStarDX.xcodeproj/project.pbxproj | 30 ++- 4 files changed, 126 insertions(+), 369 deletions(-) (limited to 'Game') diff --git a/Game/Code/Classes/UTexture.pas b/Game/Code/Classes/UTexture.pas index ca576df4..02fb8e52 100644 --- a/Game/Code/Classes/UTexture.pas +++ b/Game/Code/Classes/UTexture.pas @@ -131,7 +131,7 @@ implementation uses ULog, DateUtils, UCovers, - {$ifdef FPC} + {$ifdef LINUX} fileutil, {$endif} {$IFDEF LAZARUS} @@ -251,7 +251,7 @@ function TTextureUnit.LoadImage(Identifier: PChar): PSDL_Surface; function FileExistsInsensative( var aFileName : PChar ): boolean; begin -{$IFDEF fpc} +{$IFDEF LINUX} // eddie: Changed FPC to LINUX: Windows and Mac OS X dont have case sensitive file systems result := true; if FileExists( aFileName ) then diff --git a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1v3 b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1v3 index 52f06983..dfe66827 100644 --- a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1v3 +++ b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1v3 @@ -200,24 +200,24 @@ Content PBXProjectModuleGUID - 2CB9E8C70D43BECB00214DFA + 2CE603EA0D71601400DB0D88 PBXProjectModuleLabel - USong.pas + UTexture.pas PBXSplitModuleInNavigatorKey Split0 PBXProjectModuleGUID - 2CB9E8C80D43BECB00214DFA + 2CE603EB0D71601400DB0D88 PBXProjectModuleLabel - USong.pas + UTexture.pas _historyCapacity 0 bookmark - 2CB9E90F0D43C6BD00214DFA + 2CE603FF0D7160F300DB0D88 history - 2CB9E9080D43C60E00214DFA + 2CE603EC0D71601400DB0D88 SplitCount @@ -229,98 +229,18 @@ Geometry Frame - {{0, 20}, {993, 838}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 15 144 993 879 0 0 1680 1028 - - - - Content - - PBXProjectModuleGUID - 2CB9E8990D43B80A00214DFA - PBXProjectModuleLabel - USongs.pas - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 2CB9E89A0D43B80A00214DFA - PBXProjectModuleLabel - USongs.pas - _historyCapacity - 0 - bookmark - 2CB9E9100D43C6BD00214DFA - history - - 2CB9E8F10D43C00200214DFA - - - SplitCount - 1 - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {797, 748}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 15 212 797 789 0 0 1680 1028 - - - - Content - - PBXProjectModuleGUID - 2CB9E8CA0D43BECB00214DFA - PBXProjectModuleLabel - UFiles.pas - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 2CB9E8CB0D43BECB00214DFA - PBXProjectModuleLabel - UFiles.pas - _historyCapacity - 0 - bookmark - 2CB9E9110D43C6BD00214DFA - history - - 2CB9E8BF0D43BD1400214DFA - - - SplitCount - 1 - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {874, 786}} + {{0, 20}, {776, 858}} PBXModuleWindowStatusBarHidden2 RubberWindowFrame - 84 133 874 827 0 0 1680 1028 + 15 124 776 899 0 0 1680 1028 Content PBXProjectModuleGUID - 2C91297D0D43ADA1009299BF + 2CE603EE0D71601400DB0D88 PBXProjectModuleLabel UPlatformMacOSX.pas PBXSplitModuleInNavigatorKey @@ -328,16 +248,16 @@ Split0 PBXProjectModuleGUID - 2C91297E0D43ADA1009299BF + 2CE603EF0D71601400DB0D88 PBXProjectModuleLabel UPlatformMacOSX.pas _historyCapacity 0 bookmark - 2CB9E9120D43C6BD00214DFA + 2CE604000D7160F300DB0D88 history - 2C91297F0D43ADA1009299BF + 2CE603E50D715F9B00DB0D88 SplitCount @@ -356,86 +276,6 @@ 79 126 776 900 0 0 1680 1028 - - Content - - PBXProjectModuleGUID - 2C9129800D43ADA1009299BF - PBXProjectModuleLabel - UPlatform.pas - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 2C9129810D43ADA1009299BF - PBXProjectModuleLabel - UPlatform.pas - _historyCapacity - 0 - bookmark - 2CB9E9130D43C6BD00214DFA - history - - 2C9129820D43ADA1009299BF - - - SplitCount - 1 - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {776, 858}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 200 127 776 899 0 0 1680 1028 - - - - Content - - PBXProjectModuleGUID - 2C4D9D060D381D8200270C66 - PBXProjectModuleLabel - UScreenMain.pas - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 2C4D9D070D381D8200270C66 - PBXProjectModuleLabel - UScreenMain.pas - _historyCapacity - 0 - bookmark - 2CB9E9140D43C6BD00214DFA - history - - 2C9129830D43ADA1009299BF - - - SplitCount - 1 - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {754, 847}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 38 135 754 888 0 0 1680 1028 - - PerspectiveWidths @@ -622,9 +462,9 @@ TableOfContents - 2CB9E8830D43B7A600214DFA + 2CE603E80D71601400DB0D88 1CE0B1FE06471DED0097A5F4 - 2CB9E8840D43B7A600214DFA + 2CE603E90D71601400DB0D88 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -756,19 +596,15 @@ 5 WindowOrderList - 2CB9E8900D43B7A600214DFA - 2CB9E8910D43B7A600214DFA - 2CB9E8920D43B7A600214DFA - 2C4D9D060D381D8200270C66 - 2C9129800D43ADA1009299BF - 2C91297D0D43ADA1009299BF - 2C65660B0CF2236C0041F7DC - 2CB9E8CA0D43BECB00214DFA - 2CB9E8990D43B80A00214DFA - /Users/eddie/Projekte/UltraStarDX/trunk/Game/Code/MacOSX/UltraStarDX.xcodeproj - 2CB9E8C70D43BECB00214DFA + 2CE603F80D71601400DB0D88 + 2CE603F90D71601400DB0D88 + 2CE603FA0D71601400DB0D88 1C78EAAD065D492600B07095 1CD10A99069EF8BA00B06720 + 2C65660B0CF2236C0041F7DC + 2CE603EE0D71601400DB0D88 + 2CE603EA0D71601400DB0D88 + /Users/eddie/Projekte/UltraStarDX/trunk/Game/Code/MacOSX/UltraStarDX.xcodeproj WindowString 799 242 817 753 0 0 1680 1028 @@ -792,7 +628,7 @@ PBXProjectModuleGUID 1CD0528F0623707200166675 PBXProjectModuleLabel - + UTexture.pas StatusBarVisibility @@ -850,7 +686,7 @@ TableOfContents 2C65660B0CF2236C0041F7DC - 2CB9E8880D43B7A600214DFA + 2CE603CB0D715C9200DB0D88 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID @@ -970,13 +806,13 @@ TableOfContents 1CD10A99069EF8BA00B06720 - 2CB9E8890D43B7A600214DFA + 2CE603F10D71601400DB0D88 1C162984064C10D400B95A72 - 2CB9E88A0D43B7A600214DFA - 2CB9E88B0D43B7A600214DFA - 2CB9E88C0D43B7A600214DFA - 2CB9E88D0D43B7A600214DFA - 2CB9E88E0D43B7A600214DFA + 2CE603F20D71601400DB0D88 + 2CE603F30D71601400DB0D88 + 2CE603F40D71601400DB0D88 + 2CE603F50D71601400DB0D88 + 2CE603F60D71601400DB0D88 ToolbarConfiguration xcode.toolbar.config.debugV3 @@ -985,7 +821,7 @@ WindowToolGUID 1CD10A99069EF8BA00B06720 WindowToolIsVisible - + FirstTimeWindowDisplayed @@ -1003,12 +839,14 @@ Dock + BecomeActive + ContentConfiguration PBXProjectModuleGUID 1CDD528C0622207200134675 PBXProjectModuleLabel - UIni.pas + UAudioPlayback_Bass.pas StatusBarVisibility @@ -1029,8 +867,6 @@ 502pt - BecomeActive - ContentConfiguration PBXProjectModuleGUID @@ -1066,8 +902,8 @@ TableOfContents 1C530D57069F1CE1000CFCEE - 2C91298B0D43ADA1009299BF - 2C91298C0D43ADA1009299BF + 2CA2E2DE0D491DDF00E7C4DF + 2CA2E2DF0D491DDF00E7C4DF 1CDD528C0622207200134675 1CD0528E0623707200166675 @@ -1097,8 +933,6 @@ Dock - BecomeActive - ContentConfiguration PBXProjectModuleGUID @@ -1134,7 +968,7 @@ TableOfContents 1C78EAAD065D492600B07095 - 2CB9E88F0D43B7A600214DFA + 2CE603F70D71601400DB0D88 1C78EAAC065D492600B07095 ToolbarConfiguration @@ -1144,7 +978,7 @@ WindowToolGUID 1C78EAAD065D492600B07095 WindowToolIsVisible - + Identifier diff --git a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser index ef721549..8c30a077 100644 --- a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser +++ b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser @@ -93,9 +93,9 @@ }; 2C4D9C6E0CC9EC8C0031092D /* UFiles.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {815, 2058}}"; + sepNavIntBoundsRect = "{{0, 0}, {815, 2086}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{2415, 2047}"; + sepNavVisRange = "{2303, 2169}"; sepNavVisRect = "{{0, 4494}, {923, 342}}"; sepNavWindowFrame = "{{84, 77}, {874, 883}}"; }; @@ -262,9 +262,9 @@ }; 2C4D9C840CC9EC8C0031092D /* URecord.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {738, 3794}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 1755}"; + sepNavIntBoundsRect = "{{0, 0}, {881, 10862}}"; + sepNavSelRange = "{4086, 14}"; + sepNavVisRange = "{3581, 928}"; sepNavVisRect = "{{0, 4312}, {758, 716}}"; sepNavWindowFrame = "{{130, 73}, {797, 845}}"; }; @@ -304,9 +304,9 @@ }; 2C4D9C890CC9EC8C0031092D /* USongs.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {872, 12992}}"; + sepNavIntBoundsRect = "{{0, 0}, {920, 13636}}"; sepNavSelRange = "{6946, 0}"; - sepNavVisRange = "{6493, 916}"; + sepNavVisRange = "{6429, 995}"; sepNavVisRect = "{{0, 4157}, {758, 716}}"; sepNavWindowFrame = "{{15, 156}, {797, 845}}"; }; @@ -321,9 +321,9 @@ }; 2C4D9C8B0CC9EC8C0031092D /* UTexture.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {842, 16254}}"; - sepNavSelRange = "{15244, 0}"; - sepNavVisRange = "{14754, 860}"; + sepNavIntBoundsRect = "{{0, 0}, {854, 16562}}"; + sepNavSelRange = "{10496, 0}"; + sepNavVisRange = "{9347, 1705}"; sepNavVisRect = "{{0, 3420}, {737, 826}}"; sepNavWindowFrame = "{{15, 68}, {776, 955}}"; }; @@ -354,22 +354,6 @@ sepNavWindowFrame = "{{15, 178}, {797, 845}}"; }; }; - 2C4D9D160D381EBD00270C66 /* UTexture.pas:318 */ = { - isa = PBXFileBreakpoint; - actions = ( - ); - breakpointStyle = 0; - continueAfterActions = 0; - countType = 0; - delayBeforeContinue = 0; - fileReference = 2C4D9C8B0CC9EC8C0031092D /* UTexture.pas */; - hitCount = 0; - ignoreCount = 0; - lineNumber = 318; - location = UltraStarDX; - modificationTime = 222545419.290224; - state = 1; - }; 2C4D9D900CC9ED4F0031092D /* FreeBitmap.pas */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {974, 24374}}"; @@ -537,43 +521,13 @@ }; 2C8937310CE395CE005D8A87 /* UPlatformMacOSX.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {740, 1918}}"; - sepNavSelRange = "{1020, 0}"; - sepNavVisRange = "{23, 1818}"; + sepNavIntBoundsRect = "{{0, 0}, {740, 1848}}"; + sepNavSelRange = "{717, 0}"; + sepNavVisRange = "{493, 1700}"; sepNavVisRect = "{{0, 105}, {737, 827}}"; sepNavWindowFrame = "{{79, 70}, {776, 956}}"; }; }; - 2C91297F0D43ADA1009299BF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2C8937310CE395CE005D8A87 /* UPlatformMacOSX.pas */; - name = "UPlatformMacOSX.pas: 31"; - rLen = 0; - rLoc = 1020; - rType = 0; - vrLen = 1818; - vrLoc = 23; - }; - 2C9129820D43ADA1009299BF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2C8937290CE393FB005D8A87 /* UPlatform.pas */; - name = "UPlatform.pas: 31"; - rLen = 0; - rLoc = 830; - rType = 0; - vrLen = 1433; - vrLoc = 241; - }; - 2C9129830D43ADA1009299BF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2CF54F4A0CDA1B2B00627463 /* UScreenMain.pas */; - name = "UScreenMain.pas: 220"; - rLen = 0; - rLoc = 5112; - rType = 0; - vrLen = 1285; - vrLoc = 4486; - }; 2CAC2BDD0D3809F500CA518A /* UAudioInput_Bass.pas */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {815, 4018}}"; @@ -582,92 +536,21 @@ sepNavWindowFrame = "{{15, 140}, {874, 883}}"; }; }; + 2CAC2BDF0D3809F500CA518A /* UAudioPlayback_Bass.pas */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {729, 7224}}"; + sepNavSelRange = "{4658, 3}"; + sepNavVisRange = "{4075, 1054}"; + }; + }; 2CB9E87D0D43B78400214DFA /* USong.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1550, 9898}}"; + sepNavIntBoundsRect = "{{0, 0}, {1550, 10290}}"; sepNavSelRange = "{19153, 0}"; - sepNavVisRange = "{18561, 846}"; + sepNavVisRange = "{18134, 1509}"; sepNavWindowFrame = "{{15, 88}, {993, 935}}"; }; }; - 2CB9E8BF0D43BD1400214DFA /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 2C4D9C6E0CC9EC8C0031092D /* UFiles.pas */; - }; - 2CB9E8F10D43C00200214DFA /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2C4D9C890CC9EC8C0031092D /* USongs.pas */; - rLen = 0; - rLoc = 291; - rType = 1; - }; - 2CB9E9080D43C60E00214DFA /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2CB9E87D0D43B78400214DFA /* USong.pas */; - rLen = 0; - rLoc = 713; - rType = 1; - }; - 2CB9E90F0D43C6BD00214DFA /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2CB9E87D0D43B78400214DFA /* USong.pas */; - name = "USong.pas: 714"; - rLen = 0; - rLoc = 19153; - rType = 0; - vrLen = 846; - vrLoc = 18561; - }; - 2CB9E9100D43C6BD00214DFA /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2C4D9C890CC9EC8C0031092D /* USongs.pas */; - name = "USongs.pas: 292"; - rLen = 0; - rLoc = 6946; - rType = 0; - vrLen = 916; - vrLoc = 6493; - }; - 2CB9E9110D43C6BD00214DFA /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2C4D9C6E0CC9EC8C0031092D /* UFiles.pas */; - name = "UFiles.pas: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 2047; - vrLoc = 2415; - }; - 2CB9E9120D43C6BD00214DFA /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2C8937310CE395CE005D8A87 /* UPlatformMacOSX.pas */; - name = "UPlatformMacOSX.pas: 31"; - rLen = 0; - rLoc = 1020; - rType = 0; - vrLen = 1818; - vrLoc = 23; - }; - 2CB9E9130D43C6BD00214DFA /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2C8937290CE393FB005D8A87 /* UPlatform.pas */; - name = "UPlatform.pas: 31"; - rLen = 0; - rLoc = 830; - rType = 0; - vrLen = 1433; - vrLoc = 241; - }; - 2CB9E9140D43C6BD00214DFA /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2CF54F4A0CDA1B2B00627463 /* UScreenMain.pas */; - name = "UScreenMain.pas: 220"; - rLen = 0; - rLoc = 5112; - rType = 0; - vrLen = 1285; - vrLoc = 4486; - }; 2CDC716B0CDB9CB70018F966 /* StrUtils.pas */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1013, 1022}}"; @@ -683,7 +566,7 @@ argumentStrings = ( ); autoAttachOnCrash = 1; - breakpointsEnabled = 1; + breakpointsEnabled = 0; configStateDict = { }; customDataFormattersEnabled = 1; @@ -731,6 +614,37 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; + 2CE603E50D715F9B00DB0D88 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 2C8937310CE395CE005D8A87 /* UPlatformMacOSX.pas */; + }; + 2CE603EC0D71601400DB0D88 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2C4D9C8B0CC9EC8C0031092D /* UTexture.pas */; + rLen = 0; + rLoc = 343; + rType = 1; + }; + 2CE603FF0D7160F300DB0D88 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2C4D9C8B0CC9EC8C0031092D /* UTexture.pas */; + name = "UTexture.pas: 344"; + rLen = 0; + rLoc = 10496; + rType = 0; + vrLen = 1705; + vrLoc = 9347; + }; + 2CE604000D7160F300DB0D88 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2C8937310CE395CE005D8A87 /* UPlatformMacOSX.pas */; + name = "UPlatformMacOSX.pas: 13"; + rLen = 0; + rLoc = 717; + rType = 0; + vrLen = 1700; + vrLoc = 493; + }; 2CEA2AF00CE3868E0097A5FF /* PseudoThread.pas */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {842, 686}}"; @@ -816,9 +730,9 @@ }; 2CF54F4A0CDA1B2B00627463 /* UScreenMain.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {695, 3836}}"; + sepNavIntBoundsRect = "{{0, 0}, {695, 3934}}"; sepNavSelRange = "{5112, 0}"; - sepNavVisRange = "{4486, 1285}"; + sepNavVisRange = "{4442, 1385}"; sepNavVisRect = "{{0, 0}, {715, 815}}"; sepNavWindowFrame = "{{38, 79}, {754, 944}}"; }; @@ -1134,7 +1048,7 @@ }; DDC6850F09F5717A004E4BFF /* Project object */ = { activeArchitecture = i386; - activeBuildConfigurationName = Debug; + activeBuildConfigurationName = Release; activeExecutable = 2CDD4B5D0CB9354800549FAC /* UltraStarDX */; activeTarget = DDC688C709F574E9004E4BFF /* UltraStarDX */; addToTargets = ( @@ -1142,7 +1056,6 @@ DDC688D409F57523004E4BFF /* Put all program sources also in this target */, ); breakpoints = ( - 2C4D9D160D381EBD00270C66 /* UTexture.pas:318 */, ); codeSenseManager = 2CDD4B6A0CB9357000549FAC /* Code sense */; executables = ( @@ -1271,22 +1184,14 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 222541603; - PBXWorkspaceStateSaveDate = 222541603; + PBXPerProjectTemplateStateSaveDate = 225532839; + PBXWorkspaceStateSaveDate = 225532839; }; perUserProjectItems = { - 2C91297F0D43ADA1009299BF /* PBXTextBookmark */ = 2C91297F0D43ADA1009299BF /* PBXTextBookmark */; - 2C9129820D43ADA1009299BF /* PBXTextBookmark */ = 2C9129820D43ADA1009299BF /* PBXTextBookmark */; - 2C9129830D43ADA1009299BF /* PBXTextBookmark */ = 2C9129830D43ADA1009299BF /* PBXTextBookmark */; - 2CB9E8BF0D43BD1400214DFA /* PBXBookmark */ = 2CB9E8BF0D43BD1400214DFA /* PBXBookmark */; - 2CB9E8F10D43C00200214DFA /* PBXTextBookmark */ = 2CB9E8F10D43C00200214DFA /* PBXTextBookmark */; - 2CB9E9080D43C60E00214DFA /* PBXTextBookmark */ = 2CB9E9080D43C60E00214DFA /* PBXTextBookmark */; - 2CB9E90F0D43C6BD00214DFA /* PBXTextBookmark */ = 2CB9E90F0D43C6BD00214DFA /* PBXTextBookmark */; - 2CB9E9100D43C6BD00214DFA /* PBXTextBookmark */ = 2CB9E9100D43C6BD00214DFA /* PBXTextBookmark */; - 2CB9E9110D43C6BD00214DFA /* PBXTextBookmark */ = 2CB9E9110D43C6BD00214DFA /* PBXTextBookmark */; - 2CB9E9120D43C6BD00214DFA /* PBXTextBookmark */ = 2CB9E9120D43C6BD00214DFA /* PBXTextBookmark */; - 2CB9E9130D43C6BD00214DFA /* PBXTextBookmark */ = 2CB9E9130D43C6BD00214DFA /* PBXTextBookmark */; - 2CB9E9140D43C6BD00214DFA /* PBXTextBookmark */ = 2CB9E9140D43C6BD00214DFA /* PBXTextBookmark */; + 2CE603E50D715F9B00DB0D88 /* PBXBookmark */ = 2CE603E50D715F9B00DB0D88 /* PBXBookmark */; + 2CE603EC0D71601400DB0D88 /* PBXTextBookmark */ = 2CE603EC0D71601400DB0D88 /* PBXTextBookmark */; + 2CE603FF0D7160F300DB0D88 /* PBXTextBookmark */ = 2CE603FF0D7160F300DB0D88 /* PBXTextBookmark */; + 2CE604000D7160F300DB0D88 /* PBXTextBookmark */ = 2CE604000D7160F300DB0D88 /* PBXTextBookmark */; }; sourceControlManager = 2CDD4B690CB9357000549FAC /* Source Control */; userBuildSettings = { diff --git a/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj b/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj index 307af5e6..8b1c3a8a 100644 --- a/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj +++ b/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj @@ -153,6 +153,12 @@ 2CDD4BE20CB947BE00549FAC /* UltraStarDX.pas in Sources */ = {isa = PBXBuildFile; fileRef = DDC6851B09F57195004E4BFF /* UltraStarDX.pas */; }; 2CDEA4F70CBD725B0096994C /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CDEA4F60CBD725B0096994C /* OpenGL.framework */; }; 2CDEC4960CC5264600FFA244 /* SDL.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 98B8BE570B1F972400162019 /* SDL.framework */; }; + 2CE603DA0D715F2100DB0D88 /* mathematics.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CE603D90D715F2100DB0D88 /* mathematics.pas */; }; + 2CE603DB0D715F2100DB0D88 /* mathematics.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CE603D90D715F2100DB0D88 /* mathematics.pas */; }; + 2CE603DE0D715F6700DB0D88 /* UAudioCore_Bass.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CE603DD0D715F6700DB0D88 /* UAudioCore_Bass.pas */; }; + 2CE603DF0D715F6700DB0D88 /* UAudioCore_Bass.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CE603DD0D715F6700DB0D88 /* UAudioCore_Bass.pas */; }; + 2CE603E20D715F8600DB0D88 /* UConfig.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CE603E10D715F8600DB0D88 /* UConfig.pas */; }; + 2CE603E30D715F8600DB0D88 /* UConfig.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CE603E10D715F8600DB0D88 /* UConfig.pas */; }; 2CE907930D1BC8A800A1FDFF /* libavcodec.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CE907900D1BC8A800A1FDFF /* libavcodec.dylib */; }; 2CE907940D1BC8A800A1FDFF /* libavformat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CE907910D1BC8A800A1FDFF /* libavformat.dylib */; }; 2CE907950D1BC8A800A1FDFF /* libavutil.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CE907920D1BC8A800A1FDFF /* libavutil.dylib */; }; @@ -443,6 +449,9 @@ 2CB9E87D0D43B78400214DFA /* USong.pas */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.pascal; name = USong.pas; path = ../Classes/USong.pas; sourceTree = SOURCE_ROOT; }; 2CDC716B0CDB9CB70018F966 /* StrUtils.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = StrUtils.pas; path = ../../../Modis/SDK/StrUtils.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; }; 2CDEA4F60CBD725B0096994C /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = ""; }; + 2CE603D90D715F2100DB0D88 /* mathematics.pas */ = {isa = PBXFileReference; fileEncoding = 12; lastKnownFileType = sourcecode.pascal; name = mathematics.pas; path = ../lib/ffmpeg/mathematics.pas; sourceTree = SOURCE_ROOT; }; + 2CE603DD0D715F6700DB0D88 /* UAudioCore_Bass.pas */ = {isa = PBXFileReference; fileEncoding = 12; lastKnownFileType = sourcecode.pascal; name = UAudioCore_Bass.pas; path = ../Classes/UAudioCore_Bass.pas; sourceTree = SOURCE_ROOT; }; + 2CE603E10D715F8600DB0D88 /* UConfig.pas */ = {isa = PBXFileReference; fileEncoding = 12; lastKnownFileType = sourcecode.pascal; name = UConfig.pas; path = ../Classes/UConfig.pas; sourceTree = SOURCE_ROOT; }; 2CE907900D1BC8A800A1FDFF /* libavcodec.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libavcodec.dylib; path = ../lib/ffmpeg/libavcodec.dylib; sourceTree = SOURCE_ROOT; }; 2CE907910D1BC8A800A1FDFF /* libavformat.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libavformat.dylib; path = ../lib/ffmpeg/libavformat.dylib; sourceTree = SOURCE_ROOT; }; 2CE907920D1BC8A800A1FDFF /* libavutil.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libavutil.dylib; path = ../lib/ffmpeg/libavutil.dylib; sourceTree = SOURCE_ROOT; }; @@ -498,7 +507,7 @@ 2CF552A40CDA42C900627463 /* opt.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = opt.pas; path = ../lib/ffmpeg/opt.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; }; 2CF552A50CDA42C900627463 /* rational.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = rational.pas; path = ../lib/ffmpeg/rational.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; }; 2CF553070CDA51B500627463 /* sdlutils.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = sdlutils.pas; path = "/Library/Frameworks/JEDI-SDL.framework/SDL/sdlutils.pas"; sourceTree = ""; tabWidth = 2; }; - 2CF77DB60CF7556C00F3B101 /* libUntil5000.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libUntil5000.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + 2CF77DB60CF7556C00F3B101 /* libLib_UltraPong.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libLib_UltraPong.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; 2CF8E6BD0CDFA8E80053A996 /* UPartyDefs.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = UPartyDefs.pas; path = ../../../Modis/SDK/UPartyDefs.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; }; 98B8BE330B1F947800162019 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 98B8BE370B1F949C00162019 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; @@ -508,7 +517,7 @@ DD37F2430A60255800975B2D /* libfpcrtl.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libfpcrtl.a; sourceTree = BUILT_PRODUCTS_DIR; }; DDC6851B09F57195004E4BFF /* UltraStarDX.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; path = UltraStarDX.pas; sourceTree = ""; tabWidth = 2; }; DDC6868B09F571C2004E4BFF /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 12; lastKnownFileType = text.xml; path = Info.plist; sourceTree = ""; }; - DDC688C809F574E9004E4BFF /* UltraStarDX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = UltraStarDX.app; sourceTree = BUILT_PRODUCTS_DIR; }; + DDC688C809F574E9004E4BFF /* UltraStar Deluxe.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "UltraStar Deluxe.app"; sourceTree = BUILT_PRODUCTS_DIR; }; DDC688CA09F574E9004E4BFF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Info.plist; sourceTree = ""; }; DDC689B309F57C69004E4BFF /* InfoPlist.strings */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = InfoPlist.strings; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; DDC689B409F57C69004E4BFF /* SDLMain.nib */ = {isa = PBXFileReference; explicitFileType = wrapper.nib; name = SDLMain.nib; path = English.lproj/SDLMain.nib; sourceTree = ""; }; @@ -592,6 +601,8 @@ 2CDD43820CBBE8D400F364DE /* Classes */ = { isa = PBXGroup; children = ( + 2CE603E10D715F8600DB0D88 /* UConfig.pas */, + 2CE603DD0D715F6700DB0D88 /* UAudioCore_Bass.pas */, 2CB9E87D0D43B78400214DFA /* USong.pas */, 2CAC2BDD0D3809F500CA518A /* UAudioInput_Bass.pas */, 2CAC2BDF0D3809F500CA518A /* UAudioPlayback_Bass.pas */, @@ -752,6 +763,7 @@ 2CF5529C0CDA428000627463 /* ffmpeg */ = { isa = PBXGroup; children = ( + 2CE603D90D715F2100DB0D88 /* mathematics.pas */, 2CF5529E0CDA42C900627463 /* avcodec.pas */, 2CF5529F0CDA42C900627463 /* avformat.pas */, 2CF552A00CDA42C900627463 /* avio.pas */, @@ -826,9 +838,9 @@ DDC6888C09F57243004E4BFF /* Products */ = { isa = PBXGroup; children = ( - DDC688C809F574E9004E4BFF /* UltraStarDX.app */, + DDC688C809F574E9004E4BFF /* UltraStar Deluxe.app */, DD37F2430A60255800975B2D /* libfpcrtl.a */, - 2CF77DB60CF7556C00F3B101 /* libUntil5000.dylib */, + 2CF77DB60CF7556C00F3B101 /* libLib_UltraPong.dylib */, ); name = Products; sourceTree = ""; @@ -860,7 +872,7 @@ ); name = Modi_Until5000; productName = Lib_UltraPong; - productReference = 2CF77DB60CF7556C00F3B101 /* libUntil5000.dylib */; + productReference = 2CF77DB60CF7556C00F3B101 /* libLib_UltraPong.dylib */; productType = "com.apple.product-type.library.dynamic"; }; DD37F2420A60255800975B2D /* fpcrtl */ = { @@ -902,7 +914,7 @@ ); name = UltraStarDX; productName = "JEDI-SDLCocoa"; - productReference = DDC688C809F574E9004E4BFF /* UltraStarDX.app */; + productReference = DDC688C809F574E9004E4BFF /* UltraStar Deluxe.app */; productType = "com.apple.product-type.application"; }; DDC688D409F57523004E4BFF /* Put all program sources also in this target */ = { @@ -1160,6 +1172,9 @@ 2CAC2BE40D3809F500CA518A /* UAudioPlayback_Bass.pas in Sources */, 2CAC2BF80D380B1B00CA518A /* Bass.pas in Sources */, 2CB9E87E0D43B78400214DFA /* USong.pas in Sources */, + 2CE603DA0D715F2100DB0D88 /* mathematics.pas in Sources */, + 2CE603DE0D715F6700DB0D88 /* UAudioCore_Bass.pas in Sources */, + 2CE603E20D715F8600DB0D88 /* UConfig.pas in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1286,6 +1301,9 @@ 2CAC2BE90D3809F500CA518A /* UAudioPlayback_Bass.pas in Sources */, 2CAC2BF90D380B1B00CA518A /* Bass.pas in Sources */, 2CB9E87F0D43B78400214DFA /* USong.pas in Sources */, + 2CE603DB0D715F2100DB0D88 /* mathematics.pas in Sources */, + 2CE603DF0D715F6700DB0D88 /* UAudioCore_Bass.pas in Sources */, + 2CE603E30D715F8600DB0D88 /* UConfig.pas in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; -- cgit v1.2.3