Updated project file for mac.

2 files changed, 83 insertions, 77 deletions

diff --git a/mana.xcodeproj/garfield.mode1v3 b/mana.xcodeproj/garfield.mode1v3
index 6738f090..5ffee627 100644
--- a/mana.xcodeproj/garfield.mode1v3
+++ b/mana.xcodeproj/garfield.mode1v3
@@ -229,6 +229,8 @@
 			<key>Layout</key>
 			<array>
 				<dict>
+					<key>BecomeActive</key>
+					<true/>
 					<key>ContentConfiguration</key>
 					<dict>
 						<key>PBXBottomSmartGroupGIDs</key>
@@ -264,19 +266,20 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
 							<array>
 								<string>20286C29FDCF999611CA2CEA</string>
-								<string>20286C2AFDCF999611CA2CEA</string>
+								<string>20286C32FDCF999611CA2CEA</string>
 								<string>1C37FBAC04509CD000000102</string>
+								<string>9228959511F662A300AE53BB</string>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>67</integer>
-									<integer>3</integer>
-									<integer>0</integer>
+									<integer>35</integer>
+									<integer>24</integer>
+									<integer>23</integer>
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-							<string>{{0, 1094}, {158, 599}}</string>
+							<string>{{0, 47}, {158, 599}}</string>
 						</dict>
 						<key>PBXTopSmartGroupGIDs</key>
 						<array/>
@@ -306,14 +309,12 @@
 					<key>Dock</key>
 					<array>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>configuration.cpp</string>
+								<string></string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -321,37 +322,7 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>configuration.cpp</string>
-										<key>_historyCapacity</key>
-										<integer>0</integer>
-										<key>bookmark</key>
-										<string>92C85D5411F295C300AB20CA</string>
-										<key>history</key>
-										<array>
-											<string>9268563511F142AD00A28C33</string>
-											<string>9268563611F142AD00A28C33</string>
-											<string>9268563711F142AD00A28C33</string>
-											<string>9268563811F142AD00A28C33</string>
-											<string>9268563911F142AD00A28C33</string>
-											<string>9268563A11F142AD00A28C33</string>
-											<string>9268563B11F142AD00A28C33</string>
-											<string>9268563D11F142AD00A28C33</string>
-											<string>9268563E11F142AD00A28C33</string>
-											<string>9268563F11F142AD00A28C33</string>
-											<string>9268579C11F14EEC00A28C33</string>
-											<string>9268580211F15D8C00A28C33</string>
-											<string>9268580311F15D8C00A28C33</string>
-											<string>9268580D11F15EBC00A28C33</string>
-											<string>9268581011F15F2600A28C33</string>
-											<string>9268582B11F15F5200A28C33</string>
-											<string>926858C011F17ADC00A28C33</string>
-											<string>926858D711F1860B00A28C33</string>
-											<string>92C85D1311F28DA600AB20CA</string>
-											<string>92C85D2111F28F7700AB20CA</string>
-											<string>92C85D2711F290B600AB20CA</string>
-											<string>92C85D3211F2921100AB20CA</string>
-											<string>92C85D4511F293D200AB20CA</string>
-										</array>
+										<string></string>
 									</dict>
 									<key>SplitCount</key>
 									<string>1</string>
@@ -362,14 +333,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {753, 406}}</string>
+								<string>{{0, 0}, {753, 0}}</string>
 								<key>RubberWindowFrame</key>
 								<string>235 191 933 658 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>406pt</string>
+							<string>0pt</string>
 						</dict>
 						<dict>
 							<key>ContentConfiguration</key>
@@ -382,14 +353,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 411}, {753, 206}}</string>
+								<string>{{0, 5}, {753, 612}}</string>
 								<key>RubberWindowFrame</key>
 								<string>235 191 933 658 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
 							<key>Proportion</key>
-							<string>206pt</string>
+							<string>612pt</string>
 						</dict>
 					</array>
 					<key>Proportion</key>
@@ -408,9 +379,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>92C85CBA11F27BAB00AB20CA</string>
+				<string>9228959611F662A300AE53BB</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>92C85CBB11F27BAB00AB20CA</string>
+				<string>9228959711F662A300AE53BB</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -544,12 +515,8 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>92C85D5311F295BA00AB20CA</string>
-		<string>92C85CD211F2871500AB20CA</string>
-		<string>92C85CD311F2871500AB20CA</string>
-		<string>1C78EAAD065D492600B07095</string>
-		<string>92A4CC8A0D1C5F1E00CA28FB</string>
 		<string>1CD10A99069EF8BA00B06720</string>
+		<string>92A4CC8A0D1C5F1E00CA28FB</string>
 		<string>/Users/garfield/Programming/mana/mana.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
@@ -574,25 +541,23 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CD0528F0623707200166675</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>log.cpp</string>
+								<string></string>
 								<key>StatusBarVisibility</key>
 								<true/>
 							</dict>
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {553, 151}}</string>
+								<string>{{0, 0}, {553, 0}}</string>
 								<key>RubberWindowFrame</key>
 								<string>107 258 553 548 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>151pt</string>
+							<string>0pt</string>
 						</dict>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -607,14 +572,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 156}, {553, 351}}</string>
+								<string>{{0, 5}, {553, 502}}</string>
 								<key>RubberWindowFrame</key>
 								<string>107 258 553 548 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXBuildResultsModule</string>
 							<key>Proportion</key>
-							<string>351pt</string>
+							<string>502pt</string>
 						</dict>
 					</array>
 					<key>Proportion</key>
@@ -632,7 +597,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>92A4CC8A0D1C5F1E00CA28FB</string>
-				<string>92C85CBD11F27BAB00AB20CA</string>
+				<string>9228959811F662A300AE53BB</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
@@ -643,7 +608,7 @@
 			<key>WindowToolGUID</key>
 			<string>92A4CC8A0D1C5F1E00CA28FB</string>
 			<key>WindowToolIsVisible</key>
-			<false/>
+			<true/>
 		</dict>
 		<dict>
 			<key>FirstTimeWindowDisplayed</key>
@@ -752,13 +717,13 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1CD10A99069EF8BA00B06720</string>
-				<string>92C85CBE11F27BAB00AB20CA</string>
+				<string>9228959911F662A300AE53BB</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>92C85CBF11F27BAB00AB20CA</string>
-				<string>92C85CC011F27BAB00AB20CA</string>
-				<string>92C85CC111F27BAB00AB20CA</string>
-				<string>92C85CC211F27BAB00AB20CA</string>
-				<string>92C85CC311F27BAB00AB20CA</string>
+				<string>9228959A11F662A300AE53BB</string>
+				<string>9228959B11F662A300AE53BB</string>
+				<string>9228959C11F662A300AE53BB</string>
+				<string>9228959D11F662A300AE53BB</string>
+				<string>9228959E11F662A300AE53BB</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debugV3</string>
@@ -914,7 +879,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C78EAAD065D492600B07095</string>
-				<string>92C85CD011F2871500AB20CA</string>
+				<string>92C85D7311F2998B00AB20CA</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
 			<key>ToolbarConfiguration</key>
diff --git a/mana.xcodeproj/project.pbxproj b/mana.xcodeproj/project.pbxproj
index 42d0ad2e..ebb84e80 100644
--- a/mana.xcodeproj/project.pbxproj
+++ b/mana.xcodeproj/project.pbxproj
@@ -14,6 +14,14 @@
 		92037A1F0ED2037300D3712D /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92037A1B0ED2037300D3712D /* text.cpp */; };
 		92037A200ED2037300D3712D /* textmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92037A1D0ED2037300D3712D /* textmanager.cpp */; };
 		920C631F0F37D0EF001DD274 /* SDL_ttf.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 926A29790F23C155005D6466 /* SDL_ttf.framework */; };
+		922895B711F665A200AE53BB /* libintl.8.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 922895B411F665A200AE53BB /* libintl.8.dylib */; };
+		922895B811F665A200AE53BB /* libphysfs.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 922895B511F665A200AE53BB /* libphysfs.1.dylib */; };
+		922895B911F665A200AE53BB /* libSDL_gfx.13.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 922895B611F665A200AE53BB /* libSDL_gfx.13.dylib */; };
+		922895BA11F665A700AE53BB /* libintl.8.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 922895B411F665A200AE53BB /* libintl.8.dylib */; };
+		922895BB11F665AB00AE53BB /* libphysfs.1.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 922895B511F665A200AE53BB /* libphysfs.1.dylib */; };
+		922895BC11F665AF00AE53BB /* libSDL_gfx.13.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 922895B611F665A200AE53BB /* libSDL_gfx.13.dylib */; };
+		922895C111F6678300AE53BB /* libiconv.2.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 922895BF11F6677F00AE53BB /* libiconv.2.dylib */; };
+		922895C211F6678700AE53BB /* libSDL-1.2.0.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 922895C011F6677F00AE53BB /* libSDL-1.2.0.dylib */; };
 		922CD9580E3D00900074C50E /* npcdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 922CD9560E3D00900074C50E /* npcdb.cpp */; };
 		922CD95F0E3D01080074C50E /* shopitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 922CD95D0E3D01080074C50E /* shopitem.cpp */; };
 		924A39F20C0784280066885E /* animationparticle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 924A39E80C0784280066885E /* animationparticle.cpp */; };
@@ -456,6 +464,11 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				922895C211F6678700AE53BB /* libSDL-1.2.0.dylib in Copy Frameworks */,
+				922895C111F6678300AE53BB /* libiconv.2.dylib in Copy Frameworks */,
+				922895BC11F665AF00AE53BB /* libSDL_gfx.13.dylib in Copy Frameworks */,
+				922895BB11F665AB00AE53BB /* libphysfs.1.dylib in Copy Frameworks */,
+				922895BA11F665A700AE53BB /* libintl.8.dylib in Copy Frameworks */,
 				926857B011F15AB200A28C33 /* guichan.framework in Copy Frameworks */,
 				920C631F0F37D0EF001DD274 /* SDL_ttf.framework in Copy Frameworks */,
 				92EEA0030D2E20B300DDE300 /* libpng.framework in Copy Frameworks */,
@@ -488,6 +501,11 @@
 		92037A1C0ED2037300D3712D /* text.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = text.h; path = src/text.h; sourceTree = "<group>"; };
 		92037A1D0ED2037300D3712D /* textmanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = textmanager.cpp; path = src/textmanager.cpp; sourceTree = "<group>"; };
 		92037A1E0ED2037300D3712D /* textmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = textmanager.h; path = src/textmanager.h; sourceTree = "<group>"; };
+		922895B411F665A200AE53BB /* libintl.8.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libintl.8.dylib; sourceTree = "<group>"; };
+		922895B511F665A200AE53BB /* libphysfs.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libphysfs.1.dylib; sourceTree = "<group>"; };
+		922895B611F665A200AE53BB /* libSDL_gfx.13.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libSDL_gfx.13.dylib; sourceTree = "<group>"; };
+		922895BF11F6677F00AE53BB /* libiconv.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libiconv.2.dylib; sourceTree = "<group>"; };
+		922895C011F6677F00AE53BB /* libSDL-1.2.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = "libSDL-1.2.0.dylib"; sourceTree = "<group>"; };
 		922CD9560E3D00900074C50E /* npcdb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = npcdb.cpp; sourceTree = "<group>"; };
 		922CD9570E3D00900074C50E /* npcdb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = npcdb.h; sourceTree = "<group>"; };
 		922CD95D0E3D01080074C50E /* shopitem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = shopitem.cpp; path = src/shopitem.cpp; sourceTree = "<group>"; };
@@ -1065,6 +1083,9 @@
 				9294DAA10C17E73200FCEDE9 /* libpng.framework in Frameworks */,
 				926A297A0F23C155005D6466 /* SDL_ttf.framework in Frameworks */,
 				926857AC11F15A9300A28C33 /* guichan.framework in Frameworks */,
+				922895B711F665A200AE53BB /* libintl.8.dylib in Frameworks */,
+				922895B811F665A200AE53BB /* libphysfs.1.dylib in Frameworks */,
+				922895B911F665A200AE53BB /* libSDL_gfx.13.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1220,6 +1241,11 @@
 		20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */ = {
 			isa = PBXGroup;
 			children = (
+				922895BF11F6677F00AE53BB /* libiconv.2.dylib */,
+				922895C011F6677F00AE53BB /* libSDL-1.2.0.dylib */,
+				922895B411F665A200AE53BB /* libintl.8.dylib */,
+				922895B511F665A200AE53BB /* libphysfs.1.dylib */,
+				922895B611F665A200AE53BB /* libSDL_gfx.13.dylib */,
 				926A29790F23C155005D6466 /* SDL_ttf.framework */,
 				9294DAA00C17E73200FCEDE9 /* libpng.framework */,
 				92BC40E80BAEF57D000DAB7F /* Cocoa.framework */,
@@ -1844,6 +1870,7 @@
 				92EEA0090D2E20D100DDE300 /* Copy Frameworks */,
 				9273BE3C0EF34050008E56E1 /* Copy Music Files */,
 				926A29AA0F23CA6D005D6466 /* Copy Font Files */,
+				922890C411F661D000AE53BB /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -1887,6 +1914,22 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		922890C411F661D000AE53BB /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "#app\ninstall_name_tool -change /opt/local/lib/libphysfs.1.dylib @executable_path/../Frameworks/libphysfs.1.dylib \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Contents/MacOS/${PRODUCT_NAME}\"\ninstall_name_tool -change /opt/local/lib/libintl.8.dylib @executable_path/../Frameworks/libintl.8.dylib \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Contents/MacOS/${PRODUCT_NAME}\"\ninstall_name_tool -change /opt/local/lib/libSDL_gfx.13.dylib @executable_path/../Frameworks/libSDL_gfx.13.dylib \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Contents/MacOS/${PRODUCT_NAME}\"";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		8D0C4E8F0486CD37000505A6 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -2135,17 +2178,18 @@
 				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
 				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
 				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEAD_CODE_STRIPPING = YES;
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
 				);
 				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
 				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"/System/Library/Frameworks\"";
-				GCC_DEBUGGING_SYMBOLS = full;
+				GCC_DEBUGGING_SYMBOLS = default;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_OPTIMIZATION_LEVEL = s;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					EATHENA_SUPPORT,
 					USE_OPENGL,
@@ -2165,6 +2209,7 @@
 				INFOPLIST_FILE = Info.plist;
 				LIBRARY_SEARCH_PATHS = (
 					/usr/lib,
+					"\"$(SRCROOT)\"",
 					/opt/local/lib,
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
@@ -2172,12 +2217,10 @@
 					"-lz",
 					"-lxml2",
 					"-lcurl",
-					"-lphysfs",
-					"-lintl",
 					"-lenet",
-					"-lsdl_gfx",
 				);
 				PREBINDING = NO;
+				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
 				PRODUCT_NAME = "The Mana World";
 				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
 				USER_HEADER_SEARCH_PATHS = src;
@@ -2191,7 +2234,7 @@
 				ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
 				COPY_PHASE_STRIP = NO;
 				DEAD_CODE_STRIPPING = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
@@ -2224,6 +2267,7 @@
 				INSTALL_PATH = "$(HOME)/Applications";
 				LIBRARY_SEARCH_PATHS = (
 					/usr/lib,
+					"\"$(SRCROOT)\"",
 					/opt/local/lib,
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
@@ -2232,10 +2276,7 @@
 					"-lz",
 					"-lxml2",
 					"-lcurl",
-					"-lphysfs",
-					"-lintl",
 					"-lenet",
-					"-lsdl_gfx",
 				);
 				PREBINDING = NO;
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES;