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

1 files changed, 37 insertions, 203 deletions

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 @@
 			<key>Content</key>
 			<dict>
 				<key>PBXProjectModuleGUID</key>
-				<string>2CB9E8C70D43BECB00214DFA</string>
+				<string>2CE603EA0D71601400DB0D88</string>
 				<key>PBXProjectModuleLabel</key>
-				<string>USong.pas</string>
+				<string>UTexture.pas</string>
 				<key>PBXSplitModuleInNavigatorKey</key>
 				<dict>
 					<key>Split0</key>
 					<dict>
 						<key>PBXProjectModuleGUID</key>
-						<string>2CB9E8C80D43BECB00214DFA</string>
+						<string>2CE603EB0D71601400DB0D88</string>
 						<key>PBXProjectModuleLabel</key>
-						<string>USong.pas</string>
+						<string>UTexture.pas</string>
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2CB9E90F0D43C6BD00214DFA</string>
+						<string>2CE603FF0D7160F300DB0D88</string>
 						<key>history</key>
 						<array>
-							<string>2CB9E9080D43C60E00214DFA</string>
+							<string>2CE603EC0D71601400DB0D88</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -229,98 +229,18 @@
 			<key>Geometry</key>
 			<dict>
 				<key>Frame</key>
-				<string>{{0, 20}, {993, 838}}</string>
-				<key>PBXModuleWindowStatusBarHidden2</key>
-				<false/>
-				<key>RubberWindowFrame</key>
-				<string>15 144 993 879 0 0 1680 1028 </string>
-			</dict>
-		</dict>
-		<dict>
-			<key>Content</key>
-			<dict>
-				<key>PBXProjectModuleGUID</key>
-				<string>2CB9E8990D43B80A00214DFA</string>
-				<key>PBXProjectModuleLabel</key>
-				<string>USongs.pas</string>
-				<key>PBXSplitModuleInNavigatorKey</key>
-				<dict>
-					<key>Split0</key>
-					<dict>
-						<key>PBXProjectModuleGUID</key>
-						<string>2CB9E89A0D43B80A00214DFA</string>
-						<key>PBXProjectModuleLabel</key>
-						<string>USongs.pas</string>
-						<key>_historyCapacity</key>
-						<integer>0</integer>
-						<key>bookmark</key>
-						<string>2CB9E9100D43C6BD00214DFA</string>
-						<key>history</key>
-						<array>
-							<string>2CB9E8F10D43C00200214DFA</string>
-						</array>
-					</dict>
-					<key>SplitCount</key>
-					<string>1</string>
-				</dict>
-				<key>StatusBarVisibility</key>
-				<true/>
-			</dict>
-			<key>Geometry</key>
-			<dict>
-				<key>Frame</key>
-				<string>{{0, 20}, {797, 748}}</string>
-				<key>PBXModuleWindowStatusBarHidden2</key>
-				<false/>
-				<key>RubberWindowFrame</key>
-				<string>15 212 797 789 0 0 1680 1028 </string>
-			</dict>
-		</dict>
-		<dict>
-			<key>Content</key>
-			<dict>
-				<key>PBXProjectModuleGUID</key>
-				<string>2CB9E8CA0D43BECB00214DFA</string>
-				<key>PBXProjectModuleLabel</key>
-				<string>UFiles.pas</string>
-				<key>PBXSplitModuleInNavigatorKey</key>
-				<dict>
-					<key>Split0</key>
-					<dict>
-						<key>PBXProjectModuleGUID</key>
-						<string>2CB9E8CB0D43BECB00214DFA</string>
-						<key>PBXProjectModuleLabel</key>
-						<string>UFiles.pas</string>
-						<key>_historyCapacity</key>
-						<integer>0</integer>
-						<key>bookmark</key>
-						<string>2CB9E9110D43C6BD00214DFA</string>
-						<key>history</key>
-						<array>
-							<string>2CB9E8BF0D43BD1400214DFA</string>
-						</array>
-					</dict>
-					<key>SplitCount</key>
-					<string>1</string>
-				</dict>
-				<key>StatusBarVisibility</key>
-				<true/>
-			</dict>
-			<key>Geometry</key>
-			<dict>
-				<key>Frame</key>
-				<string>{{0, 20}, {874, 786}}</string>
+				<string>{{0, 20}, {776, 858}}</string>
 				<key>PBXModuleWindowStatusBarHidden2</key>
 				<false/>
 				<key>RubberWindowFrame</key>
-				<string>84 133 874 827 0 0 1680 1028 </string>
+				<string>15 124 776 899 0 0 1680 1028 </string>
 			</dict>
 		</dict>
 		<dict>
 			<key>Content</key>
 			<dict>
 				<key>PBXProjectModuleGUID</key>
-				<string>2C91297D0D43ADA1009299BF</string>
+				<string>2CE603EE0D71601400DB0D88</string>
 				<key>PBXProjectModuleLabel</key>
 				<string>UPlatformMacOSX.pas</string>
 				<key>PBXSplitModuleInNavigatorKey</key>
@@ -328,16 +248,16 @@
 					<key>Split0</key>
 					<dict>
 						<key>PBXProjectModuleGUID</key>
-						<string>2C91297E0D43ADA1009299BF</string>
+						<string>2CE603EF0D71601400DB0D88</string>
 						<key>PBXProjectModuleLabel</key>
 						<string>UPlatformMacOSX.pas</string>
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2CB9E9120D43C6BD00214DFA</string>
+						<string>2CE604000D7160F300DB0D88</string>
 						<key>history</key>
 						<array>
-							<string>2C91297F0D43ADA1009299BF</string>
+							<string>2CE603E50D715F9B00DB0D88</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -356,86 +276,6 @@
 				<string>79 126 776 900 0 0 1680 1028 </string>
 			</dict>
 		</dict>
-		<dict>
-			<key>Content</key>
-			<dict>
-				<key>PBXProjectModuleGUID</key>
-				<string>2C9129800D43ADA1009299BF</string>
-				<key>PBXProjectModuleLabel</key>
-				<string>UPlatform.pas</string>
-				<key>PBXSplitModuleInNavigatorKey</key>
-				<dict>
-					<key>Split0</key>
-					<dict>
-						<key>PBXProjectModuleGUID</key>
-						<string>2C9129810D43ADA1009299BF</string>
-						<key>PBXProjectModuleLabel</key>
-						<string>UPlatform.pas</string>
-						<key>_historyCapacity</key>
-						<integer>0</integer>
-						<key>bookmark</key>
-						<string>2CB9E9130D43C6BD00214DFA</string>
-						<key>history</key>
-						<array>
-							<string>2C9129820D43ADA1009299BF</string>
-						</array>
-					</dict>
-					<key>SplitCount</key>
-					<string>1</string>
-				</dict>
-				<key>StatusBarVisibility</key>
-				<true/>
-			</dict>
-			<key>Geometry</key>
-			<dict>
-				<key>Frame</key>
-				<string>{{0, 20}, {776, 858}}</string>
-				<key>PBXModuleWindowStatusBarHidden2</key>
-				<false/>
-				<key>RubberWindowFrame</key>
-				<string>200 127 776 899 0 0 1680 1028 </string>
-			</dict>
-		</dict>
-		<dict>
-			<key>Content</key>
-			<dict>
-				<key>PBXProjectModuleGUID</key>
-				<string>2C4D9D060D381D8200270C66</string>
-				<key>PBXProjectModuleLabel</key>
-				<string>UScreenMain.pas</string>
-				<key>PBXSplitModuleInNavigatorKey</key>
-				<dict>
-					<key>Split0</key>
-					<dict>
-						<key>PBXProjectModuleGUID</key>
-						<string>2C4D9D070D381D8200270C66</string>
-						<key>PBXProjectModuleLabel</key>
-						<string>UScreenMain.pas</string>
-						<key>_historyCapacity</key>
-						<integer>0</integer>
-						<key>bookmark</key>
-						<string>2CB9E9140D43C6BD00214DFA</string>
-						<key>history</key>
-						<array>
-							<string>2C9129830D43ADA1009299BF</string>
-						</array>
-					</dict>
-					<key>SplitCount</key>
-					<string>1</string>
-				</dict>
-				<key>StatusBarVisibility</key>
-				<true/>
-			</dict>
-			<key>Geometry</key>
-			<dict>
-				<key>Frame</key>
-				<string>{{0, 20}, {754, 847}}</string>
-				<key>PBXModuleWindowStatusBarHidden2</key>
-				<false/>
-				<key>RubberWindowFrame</key>
-				<string>38 135 754 888 0 0 1680 1028 </string>
-			</dict>
-		</dict>
 	</array>
 	<key>PerspectiveWidths</key>
 	<array>
@@ -622,9 +462,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>2CB9E8830D43B7A600214DFA</string>
+				<string>2CE603E80D71601400DB0D88</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>2CB9E8840D43B7A600214DFA</string>
+				<string>2CE603E90D71601400DB0D88</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -756,19 +596,15 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>2CB9E8900D43B7A600214DFA</string>
-		<string>2CB9E8910D43B7A600214DFA</string>
-		<string>2CB9E8920D43B7A600214DFA</string>
-		<string>2C4D9D060D381D8200270C66</string>
-		<string>2C9129800D43ADA1009299BF</string>
-		<string>2C91297D0D43ADA1009299BF</string>
-		<string>2C65660B0CF2236C0041F7DC</string>
-		<string>2CB9E8CA0D43BECB00214DFA</string>
-		<string>2CB9E8990D43B80A00214DFA</string>
-		<string>/Users/eddie/Projekte/UltraStarDX/trunk/Game/Code/MacOSX/UltraStarDX.xcodeproj</string>
-		<string>2CB9E8C70D43BECB00214DFA</string>
+		<string>2CE603F80D71601400DB0D88</string>
+		<string>2CE603F90D71601400DB0D88</string>
+		<string>2CE603FA0D71601400DB0D88</string>
 		<string>1C78EAAD065D492600B07095</string>
 		<string>1CD10A99069EF8BA00B06720</string>
+		<string>2C65660B0CF2236C0041F7DC</string>
+		<string>2CE603EE0D71601400DB0D88</string>
+		<string>2CE603EA0D71601400DB0D88</string>
+		<string>/Users/eddie/Projekte/UltraStarDX/trunk/Game/Code/MacOSX/UltraStarDX.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
 	<string>799 242 817 753 0 0 1680 1028 </string>
@@ -792,7 +628,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CD0528F0623707200166675</string>
 								<key>PBXProjectModuleLabel</key>
-								<string></string>
+								<string>UTexture.pas</string>
 								<key>StatusBarVisibility</key>
 								<true/>
 							</dict>
@@ -850,7 +686,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>2C65660B0CF2236C0041F7DC</string>
-				<string>2CB9E8880D43B7A600214DFA</string>
+				<string>2CE603CB0D715C9200DB0D88</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
@@ -970,13 +806,13 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1CD10A99069EF8BA00B06720</string>
-				<string>2CB9E8890D43B7A600214DFA</string>
+				<string>2CE603F10D71601400DB0D88</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>2CB9E88A0D43B7A600214DFA</string>
-				<string>2CB9E88B0D43B7A600214DFA</string>
-				<string>2CB9E88C0D43B7A600214DFA</string>
-				<string>2CB9E88D0D43B7A600214DFA</string>
-				<string>2CB9E88E0D43B7A600214DFA</string>
+				<string>2CE603F20D71601400DB0D88</string>
+				<string>2CE603F30D71601400DB0D88</string>
+				<string>2CE603F40D71601400DB0D88</string>
+				<string>2CE603F50D71601400DB0D88</string>
+				<string>2CE603F60D71601400DB0D88</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debugV3</string>
@@ -985,7 +821,7 @@
 			<key>WindowToolGUID</key>
 			<string>1CD10A99069EF8BA00B06720</string>
 			<key>WindowToolIsVisible</key>
-			<true/>
+			<false/>
 		</dict>
 		<dict>
 			<key>FirstTimeWindowDisplayed</key>
@@ -1003,12 +839,14 @@
 							<key>Dock</key>
 							<array>
 								<dict>
+									<key>BecomeActive</key>
+									<true/>
 									<key>ContentConfiguration</key>
 									<dict>
 										<key>PBXProjectModuleGUID</key>
 										<string>1CDD528C0622207200134675</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>UIni.pas</string>
+										<string>UAudioPlayback_Bass.pas</string>
 										<key>StatusBarVisibility</key>
 										<true/>
 									</dict>
@@ -1029,8 +867,6 @@
 							<string>502pt</string>
 						</dict>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -1066,8 +902,8 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C530D57069F1CE1000CFCEE</string>
-				<string>2C91298B0D43ADA1009299BF</string>
-				<string>2C91298C0D43ADA1009299BF</string>
+				<string>2CA2E2DE0D491DDF00E7C4DF</string>
+				<string>2CA2E2DF0D491DDF00E7C4DF</string>
 				<string>1CDD528C0622207200134675</string>
 				<string>1CD0528E0623707200166675</string>
 			</array>
@@ -1097,8 +933,6 @@
 					<key>Dock</key>
 					<array>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -1134,7 +968,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C78EAAD065D492600B07095</string>
-				<string>2CB9E88F0D43B7A600214DFA</string>
+				<string>2CE603F70D71601400DB0D88</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
 			<key>ToolbarConfiguration</key>
@@ -1144,7 +978,7 @@
 			<key>WindowToolGUID</key>
 			<string>1C78EAAD065D492600B07095</string>
 			<key>WindowToolIsVisible</key>
-			<true/>
+			<false/>
 		</dict>
 		<dict>
 			<key>Identifier</key>