Fixed compilation on the mac.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@972 b956fd51-792f-4845-bead-9b4dfca2ff2c

4 files changed, 590 insertions, 117 deletions

diff --git a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1v3 b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1v3
index dfe66827..3a15da1d 100644
--- a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1v3
+++ b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1v3
@@ -200,6 +200,286 @@
 			<key>Content</key>
 			<dict>
 				<key>PBXProjectModuleGUID</key>
+				<string>2CA608820D9998CC00EBC4A7</string>
+				<key>PBXProjectModuleLabel</key>
+				<string>UAudioPlayback_Bass.pas</string>
+				<key>PBXSplitModuleInNavigatorKey</key>
+				<dict>
+					<key>Split0</key>
+					<dict>
+						<key>PBXProjectModuleGUID</key>
+						<string>2CA608830D9998CC00EBC4A7</string>
+						<key>PBXProjectModuleLabel</key>
+						<string>UAudioPlayback_Bass.pas</string>
+						<key>_historyCapacity</key>
+						<integer>0</integer>
+						<key>bookmark</key>
+						<string>2CA6088F0D99999100EBC4A7</string>
+						<key>history</key>
+						<array>
+							<string>2CA608790D99987900EBC4A7</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}, {993, 838}}</string>
+				<key>PBXModuleWindowStatusBarHidden2</key>
+				<false/>
+				<key>RubberWindowFrame</key>
+				<string>38 123 993 879 0 0 1680 1028 </string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Content</key>
+			<dict>
+				<key>PBXProjectModuleGUID</key>
+				<string>2CA608850D9998CC00EBC4A7</string>
+				<key>PBXProjectModuleLabel</key>
+				<string>UAudioCore_Bass.pas</string>
+				<key>PBXSplitModuleInNavigatorKey</key>
+				<dict>
+					<key>Split0</key>
+					<dict>
+						<key>PBXProjectModuleGUID</key>
+						<string>2CA608860D9998CC00EBC4A7</string>
+						<key>PBXProjectModuleLabel</key>
+						<string>UAudioCore_Bass.pas</string>
+						<key>_historyCapacity</key>
+						<integer>0</integer>
+						<key>bookmark</key>
+						<string>2CA608900D99999100EBC4A7</string>
+						<key>history</key>
+						<array>
+							<string>2CA608780D99987200EBC4A7</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}, {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>2C019A0B0D998D4A00974970</string>
+				<key>PBXProjectModuleLabel</key>
+				<string>UMain.pas</string>
+				<key>PBXSplitModuleInNavigatorKey</key>
+				<dict>
+					<key>Split0</key>
+					<dict>
+						<key>PBXProjectModuleGUID</key>
+						<string>2C019A0C0D998D4A00974970</string>
+						<key>PBXProjectModuleLabel</key>
+						<string>UMain.pas</string>
+						<key>_historyCapacity</key>
+						<integer>0</integer>
+						<key>bookmark</key>
+						<string>2CA608910D99999100EBC4A7</string>
+						<key>history</key>
+						<array>
+							<string>2CA607DD0D998F0B00EBC4A7</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}, {1052, 646}}</string>
+				<key>PBXModuleWindowStatusBarHidden2</key>
+				<false/>
+				<key>RubberWindowFrame</key>
+				<string>30 341 1052 687 0 0 1680 1028 </string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Content</key>
+			<dict>
+				<key>PBXProjectModuleGUID</key>
+				<string>2C0199490D9981C000974970</string>
+				<key>PBXProjectModuleLabel</key>
+				<string>UCommon.pas</string>
+				<key>PBXSplitModuleInNavigatorKey</key>
+				<dict>
+					<key>Split0</key>
+					<dict>
+						<key>PBXProjectModuleGUID</key>
+						<string>2C01994A0D9981C000974970</string>
+						<key>PBXProjectModuleLabel</key>
+						<string>UCommon.pas</string>
+						<key>_historyCapacity</key>
+						<integer>0</integer>
+						<key>bookmark</key>
+						<string>2CA608920D99999100EBC4A7</string>
+						<key>history</key>
+						<array>
+							<string>2CA607DF0D998F0B00EBC4A7</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 134 754 888 0 0 1680 1028 </string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Content</key>
+			<dict>
+				<key>PBXProjectModuleGUID</key>
+				<string>2C0199430D9981C000974970</string>
+				<key>PBXProjectModuleLabel</key>
+				<string>UScreenMain.pas</string>
+				<key>PBXSplitModuleInNavigatorKey</key>
+				<dict>
+					<key>Split0</key>
+					<dict>
+						<key>PBXProjectModuleGUID</key>
+						<string>2C0199440D9981C000974970</string>
+						<key>PBXProjectModuleLabel</key>
+						<string>UScreenMain.pas</string>
+						<key>_historyCapacity</key>
+						<integer>0</integer>
+						<key>bookmark</key>
+						<string>2CA608930D99999100EBC4A7</string>
+						<key>history</key>
+						<array>
+							<string>2C019A190D998D4A00974970</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>
+		<dict>
+			<key>Content</key>
+			<dict>
+				<key>PBXProjectModuleGUID</key>
+				<string>2C0199930D9984F900974970</string>
+				<key>PBXProjectModuleLabel</key>
+				<string>UltraStarDX.pas</string>
+				<key>PBXSplitModuleInNavigatorKey</key>
+				<dict>
+					<key>Split0</key>
+					<dict>
+						<key>PBXProjectModuleGUID</key>
+						<string>2C0199940D9984F900974970</string>
+						<key>PBXProjectModuleLabel</key>
+						<string>UltraStarDX.pas</string>
+						<key>_historyCapacity</key>
+						<integer>0</integer>
+						<key>bookmark</key>
+						<string>2CA608940D99999100EBC4A7</string>
+						<key>history</key>
+						<array>
+							<string>2C019A1A0D998D4A00974970</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}, {987, 762}}</string>
+				<key>PBXModuleWindowStatusBarHidden2</key>
+				<false/>
+				<key>RubberWindowFrame</key>
+				<string>311 168 987 803 0 0 1680 1028 </string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Content</key>
+			<dict>
+				<key>PBXProjectModuleGUID</key>
+				<string>2C01994C0D9981C000974970</string>
+				<key>PBXProjectModuleLabel</key>
+				<string>OpenGL12.pas</string>
+				<key>PBXSplitModuleInNavigatorKey</key>
+				<dict>
+					<key>Split0</key>
+					<dict>
+						<key>PBXProjectModuleGUID</key>
+						<string>2C01994D0D9981C000974970</string>
+						<key>PBXProjectModuleLabel</key>
+						<string>OpenGL12.pas</string>
+						<key>_historyCapacity</key>
+						<integer>0</integer>
+						<key>bookmark</key>
+						<string>2CA608950D99999100EBC4A7</string>
+						<key>history</key>
+						<array>
+							<string>2C019A1B0D998D4A00974970</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}, {1070, 868}}</string>
+				<key>PBXModuleWindowStatusBarHidden2</key>
+				<false/>
+				<key>RubberWindowFrame</key>
+				<string>1 119 1070 909 0 0 1680 1028 </string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Content</key>
+			<dict>
+				<key>PBXProjectModuleGUID</key>
 				<string>2CE603EA0D71601400DB0D88</string>
 				<key>PBXProjectModuleLabel</key>
 				<string>UTexture.pas</string>
@@ -214,10 +494,10 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2CE603FF0D7160F300DB0D88</string>
+						<string>2CA608960D99999100EBC4A7</string>
 						<key>history</key>
 						<array>
-							<string>2CE603EC0D71601400DB0D88</string>
+							<string>2C019A1C0D998D4A00974970</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -254,10 +534,10 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2CE604000D7160F300DB0D88</string>
+						<string>2CA608970D99999100EBC4A7</string>
 						<key>history</key>
 						<array>
-							<string>2CE603E50D715F9B00DB0D88</string>
+							<string>2C019A1D0D998D4A00974970</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -349,6 +629,7 @@
 								<string>2C4D9D980CC9EE0B0031092D</string>
 								<string>DD7C45450A6E72DE003FA52B</string>
 								<string>2CF5510C0CDA28F000627463</string>
+								<string>1C37FBAC04509CD000000102</string>
 								<string>1C37FAAC04509CD000000102</string>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
@@ -360,7 +641,7 @@
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-							<string>{{0, 0}, {266, 694}}</string>
+							<string>{{0, 105}, {266, 694}}</string>
 						</dict>
 						<key>PBXTopSmartGroupGIDs</key>
 						<array/>
@@ -462,9 +743,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>2CE603E80D71601400DB0D88</string>
+				<string>2CA607D80D998F0B00EBC4A7</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>2CE603E90D71601400DB0D88</string>
+				<string>2CA607D90D998F0B00EBC4A7</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -596,15 +877,22 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>2CE603F80D71601400DB0D88</string>
-		<string>2CE603F90D71601400DB0D88</string>
-		<string>2CE603FA0D71601400DB0D88</string>
+		<string>2CA6081C0D9991E800EBC4A7</string>
+		<string>2CA6081D0D9991E800EBC4A7</string>
+		<string>1C530D57069F1CE1000CFCEE</string>
 		<string>1C78EAAD065D492600B07095</string>
 		<string>1CD10A99069EF8BA00B06720</string>
 		<string>2C65660B0CF2236C0041F7DC</string>
 		<string>2CE603EE0D71601400DB0D88</string>
 		<string>2CE603EA0D71601400DB0D88</string>
+		<string>2C01994C0D9981C000974970</string>
+		<string>2C0199930D9984F900974970</string>
+		<string>2C0199430D9981C000974970</string>
+		<string>2C0199490D9981C000974970</string>
+		<string>2C019A0B0D998D4A00974970</string>
+		<string>2CA608850D9998CC00EBC4A7</string>
 		<string>/Users/eddie/Projekte/UltraStarDX/trunk/Game/Code/MacOSX/UltraStarDX.xcodeproj</string>
+		<string>2CA608820D9998CC00EBC4A7</string>
 	</array>
 	<key>WindowString</key>
 	<string>799 242 817 753 0 0 1680 1028 </string>
@@ -623,12 +911,14 @@
 					<key>Dock</key>
 					<array>
 						<dict>
+							<key>BecomeActive</key>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
 								<string>1CD0528F0623707200166675</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>UTexture.pas</string>
+								<string>UAudioInput_Bass.pas</string>
 								<key>StatusBarVisibility</key>
 								<true/>
 							</dict>
@@ -645,8 +935,6 @@
 							<string>546pt</string>
 						</dict>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -686,7 +974,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>2C65660B0CF2236C0041F7DC</string>
-				<string>2CE603CB0D715C9200DB0D88</string>
+				<string>2CA607E60D998F0B00EBC4A7</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
@@ -697,7 +985,7 @@
 			<key>WindowToolGUID</key>
 			<string>2C65660B0CF2236C0041F7DC</string>
 			<key>WindowToolIsVisible</key>
-			<true/>
+			<false/>
 		</dict>
 		<dict>
 			<key>FirstTimeWindowDisplayed</key>
@@ -806,13 +1094,13 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1CD10A99069EF8BA00B06720</string>
-				<string>2CE603F10D71601400DB0D88</string>
+				<string>2CA607E70D998F0B00EBC4A7</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>2CE603F20D71601400DB0D88</string>
-				<string>2CE603F30D71601400DB0D88</string>
-				<string>2CE603F40D71601400DB0D88</string>
-				<string>2CE603F50D71601400DB0D88</string>
-				<string>2CE603F60D71601400DB0D88</string>
+				<string>2CA607E80D998F0B00EBC4A7</string>
+				<string>2CA607E90D998F0B00EBC4A7</string>
+				<string>2CA607EA0D998F0B00EBC4A7</string>
+				<string>2CA607EB0D998F0B00EBC4A7</string>
+				<string>2CA607EC0D998F0B00EBC4A7</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debugV3</string>
@@ -839,14 +1127,12 @@
 							<key>Dock</key>
 							<array>
 								<dict>
-									<key>BecomeActive</key>
-									<true/>
 									<key>ContentConfiguration</key>
 									<dict>
 										<key>PBXProjectModuleGUID</key>
 										<string>1CDD528C0622207200134675</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>UAudioPlayback_Bass.pas</string>
+										<string>&lt;No Editor&gt;</string>
 										<key>StatusBarVisibility</key>
 										<true/>
 									</dict>
@@ -867,6 +1153,8 @@
 							<string>502pt</string>
 						</dict>
 						<dict>
+							<key>BecomeActive</key>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -902,8 +1190,8 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C530D57069F1CE1000CFCEE</string>
-				<string>2CA2E2DE0D491DDF00E7C4DF</string>
-				<string>2CA2E2DF0D491DDF00E7C4DF</string>
+				<string>2CA607ED0D998F0B00EBC4A7</string>
+				<string>2CA607EE0D998F0B00EBC4A7</string>
 				<string>1CDD528C0622207200134675</string>
 				<string>1CD0528E0623707200166675</string>
 			</array>
@@ -912,7 +1200,7 @@
 			<key>WindowToolGUID</key>
 			<string>1C530D57069F1CE1000CFCEE</string>
 			<key>WindowToolIsVisible</key>
-			<true/>
+			<false/>
 		</dict>
 		<dict>
 			<key>FirstTimeWindowDisplayed</key>
@@ -933,6 +1221,8 @@
 					<key>Dock</key>
 					<array>
 						<dict>
+							<key>BecomeActive</key>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -968,7 +1258,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C78EAAD065D492600B07095</string>
-				<string>2CE603F70D71601400DB0D88</string>
+				<string>2CA607EF0D998F0B00EBC4A7</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
 			<key>ToolbarConfiguration</key>
diff --git a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser
index 8c30a077..e054f93e 100644
--- a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser
+++ b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser
@@ -1,5 +1,63 @@
 // !$*UTF8*$!
 {
+	2C0199800D99840900974970 /* config-macosx.inc */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {934, 994}}";
+			sepNavSelRange = "{540, 0}";
+			sepNavVisRange = "{353, 1694}";
+			sepNavWindowFrame = "{{15, 88}, {993, 935}}";
+		};
+	};
+	2C019A190D998D4A00974970 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2CF54F4A0CDA1B2B00627463 /* UScreenMain.pas */;
+		name = "UScreenMain.pas: 76";
+		rLen = 17;
+		rLoc = 1560;
+		rType = 0;
+		vrLen = 1274;
+		vrLoc = 1037;
+	};
+	2C019A1A0D998D4A00974970 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = DDC6851B09F57195004E4BFF /* UltraStarDX.pas */;
+		name = "UltraStarDX.pas: 3";
+		rLen = 0;
+		rLoc = 72;
+		rType = 0;
+		vrLen = 152;
+		vrLoc = 0;
+	};
+	2C019A1B0D998D4A00974970 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9E040CC9EF840031092D /* OpenGL12.pas */;
+		name = "OpenGL12.pas: 4683";
+		rLen = 0;
+		rLoc = 213678;
+		rType = 0;
+		vrLen = 6646;
+		vrLoc = 207819;
+	};
+	2C019A1C0D998D4A00974970 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9C8B0CC9EC8C0031092D /* UTexture.pas */;
+		name = "UTexture.pas: 344";
+		rLen = 0;
+		rLoc = 10496;
+		rType = 0;
+		vrLen = 1662;
+		vrLoc = 9347;
+	};
+	2C019A1D0D998D4A00974970 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C8937310CE395CE005D8A87 /* UPlatformMacOSX.pas */;
+		name = "UPlatformMacOSX.pas: 13";
+		rLen = 0;
+		rLoc = 717;
+		rType = 0;
+		vrLen = 1571;
+		vrLoc = 493;
+	};
 	2C4B70220CF757A400B0F0BD /* Until5000.dpr */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {691, 1218}}";
@@ -10,9 +68,9 @@
 	};
 	2C4D9C620CC9EC8C0031092D /* TextGL.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {729, 7728}}";
-			sepNavSelRange = "{4228, 11}";
-			sepNavVisRange = "{3672, 1043}";
+			sepNavIntBoundsRect = "{{0, 0}, {881, 7532}}";
+			sepNavSelRange = "{10589, 66}";
+			sepNavVisRange = "{10222, 893}";
 			sepNavVisRect = "{{0, 5908}, {758, 716}}";
 			sepNavWindowFrame = "{{38, 157}, {797, 845}}";
 		};
@@ -35,10 +93,11 @@
 	};
 	2C4D9C670CC9EC8C0031092D /* UCommon.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {715, 4228}}";
-			sepNavSelRange = "{1581, 322}";
+			sepNavIntBoundsRect = "{{0, 0}, {695, 4060}}";
+			sepNavSelRange = "{584, 24}";
+			sepNavVisRange = "{249, 1447}";
 			sepNavVisRect = "{{0, 508}, {715, 815}}";
-			sepNavWindowFrame = "{{38, 58}, {754, 944}}";
+			sepNavWindowFrame = "{{38, 78}, {754, 944}}";
 		};
 	};
 	2C4D9C680CC9EC8C0031092D /* UCore.pas */ = {
@@ -195,9 +254,9 @@
 	};
 	2C4D9C7B0CC9EC8C0031092D /* UMain.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {842, 15400}}";
-			sepNavSelRange = "{9910, 0}";
-			sepNavVisRange = "{9538, 599}";
+			sepNavIntBoundsRect = "{{0, 0}, {1026, 16268}}";
+			sepNavSelRange = "{31433, 0}";
+			sepNavVisRange = "{32193, 1839}";
 			sepNavVisRect = "{{0, 0}, {1013, 614}}";
 			sepNavWindowFrame = "{{30, 285}, {1052, 743}}";
 		};
@@ -262,9 +321,9 @@
 	};
 	2C4D9C840CC9EC8C0031092D /* URecord.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {881, 10862}}";
-			sepNavSelRange = "{4086, 14}";
-			sepNavVisRange = "{3581, 928}";
+			sepNavIntBoundsRect = "{{0, 0}, {738, 8372}}";
+			sepNavSelRange = "{10657, 20}";
+			sepNavVisRange = "{10176, 1198}";
 			sepNavVisRect = "{{0, 4312}, {758, 716}}";
 			sepNavWindowFrame = "{{130, 73}, {797, 845}}";
 		};
@@ -321,9 +380,9 @@
 	};
 	2C4D9C8B0CC9EC8C0031092D /* UTexture.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {854, 16562}}";
+			sepNavIntBoundsRect = "{{0, 0}, {858, 16688}}";
 			sepNavSelRange = "{10496, 0}";
-			sepNavVisRange = "{9347, 1705}";
+			sepNavVisRange = "{9368, 1825}";
 			sepNavVisRect = "{{0, 3420}, {737, 826}}";
 			sepNavWindowFrame = "{{15, 68}, {776, 955}}";
 		};
@@ -372,9 +431,9 @@
 	};
 	2C4D9DCC0CC9EE6F0031092D /* UDisplay.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {782, 6748}}";
-			sepNavSelRange = "{8084, 0}";
-			sepNavVisRange = "{551, 818}";
+			sepNavIntBoundsRect = "{{0, 0}, {881, 6944}}";
+			sepNavSelRange = "{5028, 51}";
+			sepNavVisRange = "{4044, 1359}";
 			sepNavVisRect = "{{0, 4834}, {758, 716}}";
 			sepNavWindowFrame = "{{38, 157}, {797, 845}}";
 		};
@@ -390,9 +449,9 @@
 	};
 	2C4D9DCE0CC9EE6F0031092D /* UMenu.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1220, 21770}}";
-			sepNavSelRange = "{25533, 1}";
-			sepNavVisRange = "{22476, 1170}";
+			sepNavIntBoundsRect = "{{0, 0}, {1284, 22162}}";
+			sepNavSelRange = "{51782, 0}";
+			sepNavVisRange = "{51126, 1038}";
 			sepNavVisRect = "{{0, 3972}, {749, 470}}";
 			sepNavWindowFrame = "{{38, 82}, {898, 920}}";
 		};
@@ -472,9 +531,9 @@
 	};
 	2C4D9E040CC9EF840031092D /* OpenGL12.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1604, 65450}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{207947, 6380}";
+			sepNavIntBoundsRect = "{{0, 0}, {1608, 64064}}";
+			sepNavSelRange = "{213678, 0}";
+			sepNavVisRange = "{207797, 6669}";
 			sepNavVisRect = "{{0, 64932}, {1031, 840}}";
 			sepNavWindowFrame = "{{1, 63}, {1070, 965}}";
 		};
@@ -489,9 +548,9 @@
 	};
 	2C4D9E440CC9F0ED0031092D /* switches.inc */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {686, 980}}";
-			sepNavSelRange = "{485, 14}";
-			sepNavVisRange = "{0, 1065}";
+			sepNavIntBoundsRect = "{{0, 0}, {624, 1918}}";
+			sepNavSelRange = "{1326, 0}";
+			sepNavVisRange = "{657, 1095}";
 			sepNavVisRect = "{{0, 7}, {577, 612}}";
 			sepNavWindowFrame = "{{15, 282}, {616, 741}}";
 		};
@@ -521,26 +580,145 @@
 	};
 	2C8937310CE395CE005D8A87 /* UPlatformMacOSX.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {740, 1848}}";
+			sepNavIntBoundsRect = "{{0, 0}, {744, 1890}}";
 			sepNavSelRange = "{717, 0}";
-			sepNavVisRange = "{493, 1700}";
+			sepNavVisRange = "{410, 1660}";
 			sepNavVisRect = "{{0, 105}, {737, 827}}";
 			sepNavWindowFrame = "{{79, 70}, {776, 956}}";
 		};
 	};
+	2CA607DD0D998F0B00EBC4A7 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9C7B0CC9EC8C0031092D /* UMain.pas */;
+		name = "UMain.pas: 120";
+		rLen = 0;
+		rLoc = 2684;
+		rType = 0;
+		vrLen = 1123;
+		vrLoc = 1767;
+	};
+	2CA607DF0D998F0B00EBC4A7 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9C670CC9EC8C0031092D /* UCommon.pas */;
+		name = "UCommon.pas: 52";
+		rLen = 0;
+		rLoc = 807;
+		rType = 0;
+		vrLen = 1163;
+		vrLoc = 56;
+	};
+	2CA608780D99987200EBC4A7 /* PBXBookmark */ = {
+		isa = PBXBookmark;
+		fRef = 2CE603DD0D715F6700DB0D88 /* UAudioCore_Bass.pas */;
+	};
+	2CA608790D99987900EBC4A7 /* PBXBookmark */ = {
+		isa = PBXBookmark;
+		fRef = 2CAC2BDF0D3809F500CA518A /* UAudioPlayback_Bass.pas */;
+	};
+	2CA6088F0D99999100EBC4A7 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2CAC2BDF0D3809F500CA518A /* UAudioPlayback_Bass.pas */;
+		name = "UAudioPlayback_Bass.pas: 219";
+		rLen = 3;
+		rLoc = 4658;
+		rType = 0;
+		vrLen = 1277;
+		vrLoc = 4001;
+	};
+	2CA608900D99999100EBC4A7 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2CE603DD0D715F6700DB0D88 /* UAudioCore_Bass.pas */;
+		name = "UAudioCore_Bass.pas: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 1211;
+		vrLoc = 0;
+	};
+	2CA608910D99999100EBC4A7 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9C7B0CC9EC8C0031092D /* UMain.pas */;
+		name = "UMain.pas: 1096";
+		rLen = 0;
+		rLoc = 31433;
+		rType = 0;
+		vrLen = 1839;
+		vrLoc = 32193;
+	};
+	2CA608920D99999100EBC4A7 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9C670CC9EC8C0031092D /* UCommon.pas */;
+		name = "UCommon.pas: 44";
+		rLen = 24;
+		rLoc = 584;
+		rType = 0;
+		vrLen = 1447;
+		vrLoc = 249;
+	};
+	2CA608930D99999100EBC4A7 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2CF54F4A0CDA1B2B00627463 /* UScreenMain.pas */;
+		name = "UScreenMain.pas: 76";
+		rLen = 17;
+		rLoc = 1560;
+		rType = 0;
+		vrLen = 1336;
+		vrLoc = 1022;
+	};
+	2CA608940D99999100EBC4A7 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = DDC6851B09F57195004E4BFF /* UltraStarDX.pas */;
+		name = "UltraStarDX.pas: 3";
+		rLen = 0;
+		rLoc = 72;
+		rType = 0;
+		vrLen = 152;
+		vrLoc = 0;
+	};
+	2CA608950D99999100EBC4A7 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9E040CC9EF840031092D /* OpenGL12.pas */;
+		name = "OpenGL12.pas: 4683";
+		rLen = 0;
+		rLoc = 213678;
+		rType = 0;
+		vrLen = 6669;
+		vrLoc = 207797;
+	};
+	2CA608960D99999100EBC4A7 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9C8B0CC9EC8C0031092D /* UTexture.pas */;
+		name = "UTexture.pas: 344";
+		rLen = 0;
+		rLoc = 10496;
+		rType = 0;
+		vrLen = 1825;
+		vrLoc = 9368;
+	};
+	2CA608970D99999100EBC4A7 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C8937310CE395CE005D8A87 /* UPlatformMacOSX.pas */;
+		name = "UPlatformMacOSX.pas: 13";
+		rLen = 0;
+		rLoc = 717;
+		rType = 0;
+		vrLen = 1660;
+		vrLoc = 410;
+	};
 	2CAC2BDD0D3809F500CA518A /* UAudioInput_Bass.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {815, 4018}}";
-			sepNavSelRange = "{2733, 0}";
-			sepNavVisRange = "{5604, 1832}";
+			sepNavIntBoundsRect = "{{0, 0}, {842, 3766}}";
+			sepNavSelRange = "{5570, 0}";
+			sepNavVisRange = "{5295, 761}";
 			sepNavWindowFrame = "{{15, 140}, {874, 883}}";
 		};
 	};
 	2CAC2BDF0D3809F500CA518A /* UAudioPlayback_Bass.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {729, 7224}}";
+			sepNavIntBoundsRect = "{{0, 0}, {934, 6104}}";
 			sepNavSelRange = "{4658, 3}";
-			sepNavVisRange = "{4075, 1054}";
+			sepNavVisRange = "{4001, 1277}";
+			sepNavWindowFrame = "{{38, 67}, {993, 935}}";
 		};
 	};
 	2CB9E87D0D43B78400214DFA /* USong.pas */ = {
@@ -614,36 +792,20 @@
 		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;
+	2CE603DD0D715F6700DB0D88 /* UAudioCore_Bass.pas */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {934, 1764}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{0, 1211}";
+			sepNavWindowFrame = "{{15, 88}, {993, 935}}";
+		};
 	};
-	2CE604000D7160F300DB0D88 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C8937310CE395CE005D8A87 /* UPlatformMacOSX.pas */;
-		name = "UPlatformMacOSX.pas: 13";
-		rLen = 0;
-		rLoc = 717;
-		rType = 0;
-		vrLen = 1700;
-		vrLoc = 493;
+	2CE603E10D715F8600DB0D88 /* UConfig.pas */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {881, 3080}}";
+			sepNavSelRange = "{7279, 0}";
+			sepNavVisRange = "{6847, 865}";
+		};
 	};
 	2CEA2AF00CE3868E0097A5FF /* PseudoThread.pas */ = {
 		uiCtxt = {
@@ -730,9 +892,9 @@
 	};
 	2CF54F4A0CDA1B2B00627463 /* UScreenMain.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {695, 3934}}";
-			sepNavSelRange = "{5112, 0}";
-			sepNavVisRange = "{4442, 1385}";
+			sepNavIntBoundsRect = "{{0, 0}, {695, 4326}}";
+			sepNavSelRange = "{1560, 17}";
+			sepNavVisRange = "{1022, 1336}";
 			sepNavVisRect = "{{0, 0}, {715, 815}}";
 			sepNavWindowFrame = "{{38, 79}, {754, 944}}";
 		};
@@ -859,16 +1021,18 @@
 	};
 	2CF54F5A0CDA1B2B00627463 /* UScreenPopup.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {715, 3472}}";
-			sepNavSelRange = "{56, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {729, 3472}}";
+			sepNavSelRange = "{1402, 0}";
+			sepNavVisRange = "{987, 787}";
 			sepNavVisRect = "{{0, 0}, {715, 815}}";
 			sepNavWindowFrame = "{{38, 58}, {754, 944}}";
 		};
 	};
 	2CF54F5B0CDA1B2B00627463 /* UScreenScore.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1016, 9478}}";
-			sepNavSelRange = "{49, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {792, 14714}}";
+			sepNavSelRange = "{4909, 0}";
+			sepNavVisRange = "{4202, 810}";
 			sepNavVisRect = "{{0, 0}, {715, 815}}";
 			sepNavWindowFrame = "{{15, 79}, {754, 944}}";
 		};
@@ -893,9 +1057,9 @@
 	};
 	2CF54F5E0CDA1B2B00627463 /* UScreenSong.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {842, 31486}}";
-			sepNavSelRange = "{54304, 0}";
-			sepNavVisRange = "{53982, 735}";
+			sepNavIntBoundsRect = "{{0, 0}, {881, 31066}}";
+			sepNavSelRange = "{7241, 96}";
+			sepNavVisRange = "{6687, 1426}";
 			sepNavVisRect = "{{0, 11219}, {1277, 312}}";
 			sepNavWindowFrame = "{{38, 78}, {754, 944}}";
 		};
@@ -910,32 +1074,36 @@
 	};
 	2CF54F600CDA1B2B00627463 /* UScreenSongMenu.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {968, 8834}}";
-			sepNavSelRange = "{52, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {729, 9352}}";
+			sepNavSelRange = "{1910, 0}";
+			sepNavVisRange = "{1505, 734}";
 			sepNavVisRect = "{{0, 0}, {715, 815}}";
 			sepNavWindowFrame = "{{38, 58}, {754, 944}}";
 		};
 	};
 	2CF54F610CDA1B2B00627463 /* UScreenStatDetail.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {715, 3514}}";
-			sepNavSelRange = "{40, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {729, 3724}}";
+			sepNavSelRange = "{1078, 0}";
+			sepNavVisRange = "{661, 767}";
 			sepNavVisRect = "{{0, 0}, {715, 815}}";
 			sepNavWindowFrame = "{{15, 79}, {754, 944}}";
 		};
 	};
 	2CF54F620CDA1B2B00627463 /* UScreenStatMain.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1277, 3976}}";
-			sepNavSelRange = "{4341, 26}";
+			sepNavIntBoundsRect = "{{0, 0}, {729, 4326}}";
+			sepNavSelRange = "{1057, 0}";
+			sepNavVisRange = "{698, 731}";
 			sepNavVisRect = "{{0, 2749}, {1277, 312}}";
 			sepNavWindowFrame = "{{38, 58}, {754, 944}}";
 		};
 	};
 	2CF54F630CDA1B2B00627463 /* UScreenTop5.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {715, 2324}}";
-			sepNavSelRange = "{48, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {729, 2492}}";
+			sepNavSelRange = "{996, 0}";
+			sepNavVisRange = "{458, 883}";
 			sepNavVisRect = "{{0, 0}, {715, 815}}";
 			sepNavWindowFrame = "{{15, 79}, {754, 944}}";
 		};
@@ -1052,8 +1220,6 @@
 		activeExecutable = 2CDD4B5D0CB9354800549FAC /* UltraStarDX */;
 		activeTarget = DDC688C709F574E9004E4BFF /* UltraStarDX */;
 		addToTargets = (
-			DDC688C709F574E9004E4BFF /* UltraStarDX */,
-			DDC688D409F57523004E4BFF /* Put all program sources also in this target */,
 		);
 		breakpoints = (
 		);
@@ -1184,14 +1350,28 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 225532839;
-			PBXWorkspaceStateSaveDate = 225532839;
+			PBXPerProjectTemplateStateSaveDate = 228166993;
+			PBXWorkspaceStateSaveDate = 228166993;
 		};
 		perUserProjectItems = {
-			2CE603E50D715F9B00DB0D88 /* PBXBookmark */ = 2CE603E50D715F9B00DB0D88 /* PBXBookmark */;
-			2CE603EC0D71601400DB0D88 /* PBXTextBookmark */ = 2CE603EC0D71601400DB0D88 /* PBXTextBookmark */;
-			2CE603FF0D7160F300DB0D88 /* PBXTextBookmark */ = 2CE603FF0D7160F300DB0D88 /* PBXTextBookmark */;
-			2CE604000D7160F300DB0D88 /* PBXTextBookmark */ = 2CE604000D7160F300DB0D88 /* PBXTextBookmark */;
+			2C019A190D998D4A00974970 /* PBXTextBookmark */ = 2C019A190D998D4A00974970 /* PBXTextBookmark */;
+			2C019A1A0D998D4A00974970 /* PBXTextBookmark */ = 2C019A1A0D998D4A00974970 /* PBXTextBookmark */;
+			2C019A1B0D998D4A00974970 /* PBXTextBookmark */ = 2C019A1B0D998D4A00974970 /* PBXTextBookmark */;
+			2C019A1C0D998D4A00974970 /* PBXTextBookmark */ = 2C019A1C0D998D4A00974970 /* PBXTextBookmark */;
+			2C019A1D0D998D4A00974970 /* PBXTextBookmark */ = 2C019A1D0D998D4A00974970 /* PBXTextBookmark */;
+			2CA607DD0D998F0B00EBC4A7 /* PBXTextBookmark */ = 2CA607DD0D998F0B00EBC4A7 /* PBXTextBookmark */;
+			2CA607DF0D998F0B00EBC4A7 /* PBXTextBookmark */ = 2CA607DF0D998F0B00EBC4A7 /* PBXTextBookmark */;
+			2CA608780D99987200EBC4A7 /* PBXBookmark */ = 2CA608780D99987200EBC4A7 /* PBXBookmark */;
+			2CA608790D99987900EBC4A7 /* PBXBookmark */ = 2CA608790D99987900EBC4A7 /* PBXBookmark */;
+			2CA6088F0D99999100EBC4A7 /* PBXTextBookmark */ = 2CA6088F0D99999100EBC4A7 /* PBXTextBookmark */;
+			2CA608900D99999100EBC4A7 /* PBXTextBookmark */ = 2CA608900D99999100EBC4A7 /* PBXTextBookmark */;
+			2CA608910D99999100EBC4A7 /* PBXTextBookmark */ = 2CA608910D99999100EBC4A7 /* PBXTextBookmark */;
+			2CA608920D99999100EBC4A7 /* PBXTextBookmark */ = 2CA608920D99999100EBC4A7 /* PBXTextBookmark */;
+			2CA608930D99999100EBC4A7 /* PBXTextBookmark */ = 2CA608930D99999100EBC4A7 /* PBXTextBookmark */;
+			2CA608940D99999100EBC4A7 /* PBXTextBookmark */ = 2CA608940D99999100EBC4A7 /* PBXTextBookmark */;
+			2CA608950D99999100EBC4A7 /* PBXTextBookmark */ = 2CA608950D99999100EBC4A7 /* PBXTextBookmark */;
+			2CA608960D99999100EBC4A7 /* PBXTextBookmark */ = 2CA608960D99999100EBC4A7 /* PBXTextBookmark */;
+			2CA608970D99999100EBC4A7 /* PBXTextBookmark */ = 2CA608970D99999100EBC4A7 /* 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 8b1c3a8a..d7902145 100644
--- a/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj
+++ b/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj
@@ -374,6 +374,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		2C0199800D99840900974970 /* config-macosx.inc */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.pascal; name = "config-macosx.inc"; path = "../config-macosx.inc"; sourceTree = SOURCE_ROOT; };
 		2C4B70220CF757A400B0F0BD /* Until5000.dpr */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; name = Until5000.dpr; path = ../../../Modis/5000Points/Until5000.dpr; sourceTree = SOURCE_ROOT; };
 		2C4D9C620CC9EC8C0031092D /* TextGL.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = TextGL.pas; path = ../Classes/TextGL.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; };
 		2C4D9C650CC9EC8C0031092D /* UCatCovers.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = UCatCovers.pas; path = ../Classes/UCatCovers.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; };
@@ -795,6 +796,7 @@
 				DDC6851B09F57195004E4BFF /* UltraStarDX.pas */,
 				2CF551A70CDA356800627463 /* UltraStar.dpr */,
 				2C4D9E440CC9F0ED0031092D /* switches.inc */,
+				2C0199800D99840900974970 /* config-macosx.inc */,
 			);
 			name = Source;
 			sourceTree = "<group>";
@@ -1460,7 +1462,7 @@
 					Carbon,
 				);
 				PREBINDING = NO;
-				PRODUCT_NAME = UltraStarDX;
+				PRODUCT_NAME = "UltraStar Deluxe";
 				WRAPPER_EXTENSION = app;
 				ZERO_LINK = NO;
 			};
diff --git a/Game/Code/MacOSX/Wrapper/OpenGL12.pas b/Game/Code/MacOSX/Wrapper/OpenGL12.pas
index 0efff14e..6afa23ab 100755
--- a/Game/Code/MacOSX/Wrapper/OpenGL12.pas
+++ b/Game/Code/MacOSX/Wrapper/OpenGL12.pas
@@ -4684,6 +4684,7 @@ type
   // GLU functions
   function gluBuild2DMipmaps(target: TGLEnum; components, width, height: TGLint; format, atype: TGLEnum; Data: Pointer): TGLint; {$IFDEF DLL_STDCALL} stdcall; {$ENDIF} {$IFDEF DLL_CDECL} cdecl; {$ENDIF} external glu32;
   function gluScaleImage(format: TGLEnum; widthin, heightin: TGLint; typein: TGLEnum; datain: Pointer; widthout, heightout: TGLint; typeout: TGLEnum; dataout: Pointer): TGLint; {$IFDEF DLL_STDCALL} stdcall; {$ENDIF} {$IFDEF DLL_CDECL} cdecl; {$ENDIF} external glu32;
+  function gluErrorString(errCode : GLenum) : PChar;  {$IFDEF DLL_STDCALL} stdcall; {$ENDIF} {$IFDEF DLL_CDECL} cdecl; {$ENDIF} external glu32;
 
   Procedure LoadOpenGL;
   Procedure UnloadOpenGL;