Xcode project now compiles .po tranlations (requires gettext installed).

24 files changed, 62 insertions, 33 deletions

diff --git a/Xcode/ManaPlus.xcodeproj/project.pbxproj b/Xcode/ManaPlus.xcodeproj/project.pbxproj
index babbdd237..f92d00555 100644
--- a/Xcode/ManaPlus.xcodeproj/project.pbxproj
+++ b/Xcode/ManaPlus.xcodeproj/project.pbxproj
@@ -385,7 +385,6 @@
 		2B17130E1686A98C002E9493 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2BDF45D8166D5AEC0054E77F /* MainMenu.xib */; };
 		2B17130F1686A98C002E9493 /* data in Resources */ = {isa = PBXBuildFile; fileRef = 2BDF4D75166D781C0054E77F /* data */; };
 		2B1713101686A98C002E9493 /* manaplus.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2BAC2B43166DB4B300874178 /* manaplus.icns */; };
-		2B1713111686A98C002E9493 /* locale in Resources */ = {isa = PBXBuildFile; fileRef = 2B4EBD01166DE12200BDD105 /* locale */; };
 		2B1713131686A98C002E9493 /* SDL_image.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BDF4D4A166D5D9E0054E77F /* SDL_image.framework */; };
 		2B1713141686A98C002E9493 /* SDL_mixer.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BDF4D4B166D5D9E0054E77F /* SDL_mixer.framework */; };
 		2B1713151686A98C002E9493 /* SDL_net.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BDF4D4C166D5D9E0054E77F /* SDL_net.framework */; };
@@ -409,7 +408,6 @@
 		2B1713281686A98C002E9493 /* libSDL_gfx.14.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BDF4D94166D8E0D0054E77F /* libSDL_gfx.14.dylib */; };
 		2B1713291686A98C002E9493 /* libfreetype.6.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BDF4D8F166D8E0C0054E77F /* libfreetype.6.dylib */; };
 		2B17132A1686A98C002E9493 /* libiconv.2.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BDF4D90166D8E0C0054E77F /* libiconv.2.dylib */; };
-		2B4EBD02166DE12200BDD105 /* locale in Resources */ = {isa = PBXBuildFile; fileRef = 2B4EBD01166DE12200BDD105 /* locale */; };
 		2B8B70CB167EBCB3003A8440 /* popuplist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B8B70C9167EBCB3003A8440 /* popuplist.cpp */; };
 		2B8B70CE167EBE3A003A8440 /* setup_touch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B8B70CC167EBE3A003A8440 /* setup_touch.cpp */; };
 		2BAC2B44166DB4B300874178 /* manaplus.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2BAC2B43166DB4B300874178 /* manaplus.icns */; };
@@ -1151,11 +1149,11 @@
 		2BDF4D53166D5D9E0054E77F /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BDF4D4E166D5D9E0054E77F /* SDL.framework */; };
 		2BDF4D55166D5DCD0054E77F /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BDF4D54166D5DCD0054E77F /* OpenGL.framework */; };
 		2BDF4D76166D783A0054E77F /* data in Resources */ = {isa = PBXBuildFile; fileRef = 2BDF4D75166D781C0054E77F /* data */; };
-		2BDF4D81166D7F060054E77F /* SDL_image.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BDF4D4A166D5D9E0054E77F /* SDL_image.framework */; };
-		2BDF4D82166D7F090054E77F /* SDL_mixer.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BDF4D4B166D5D9E0054E77F /* SDL_mixer.framework */; };
-		2BDF4D83166D7F0D0054E77F /* SDL_net.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BDF4D4C166D5D9E0054E77F /* SDL_net.framework */; };
-		2BDF4D84166D7F0F0054E77F /* SDL_ttf.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BDF4D4D166D5D9E0054E77F /* SDL_ttf.framework */; };
-		2BDF4D85166D7F120054E77F /* SDL.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BDF4D4E166D5D9E0054E77F /* SDL.framework */; };
+		2BDF4D81166D7F060054E77F /* SDL_image.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 2BDF4D4A166D5D9E0054E77F /* SDL_image.framework */; };
+		2BDF4D82166D7F090054E77F /* SDL_mixer.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 2BDF4D4B166D5D9E0054E77F /* SDL_mixer.framework */; };
+		2BDF4D83166D7F0D0054E77F /* SDL_net.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 2BDF4D4C166D5D9E0054E77F /* SDL_net.framework */; };
+		2BDF4D84166D7F0F0054E77F /* SDL_ttf.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 2BDF4D4D166D5D9E0054E77F /* SDL_ttf.framework */; };
+		2BDF4D85166D7F120054E77F /* SDL.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 2BDF4D4E166D5D9E0054E77F /* SDL.framework */; };
 		2BDF4D97166D8E0D0054E77F /* libfreetype.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BDF4D8F166D8E0C0054E77F /* libfreetype.6.dylib */; };
 		2BDF4D98166D8E0D0054E77F /* libiconv.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BDF4D90166D8E0C0054E77F /* libiconv.2.dylib */; };
 		2BDF4D9B166D8E0D0054E77F /* libpng15.15.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BDF4D93166D8E0D0054E77F /* libpng15.15.dylib */; };
@@ -1224,18 +1222,19 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		2BDF4D77166D7EA00054E77F /* CopyFiles */ = {
+		2BDF4D77166D7EA00054E77F /* Copy Files */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				2BDF4D81166D7F060054E77F /* SDL_image.framework in CopyFiles */,
-				2BDF4D82166D7F090054E77F /* SDL_mixer.framework in CopyFiles */,
-				2BDF4D83166D7F0D0054E77F /* SDL_net.framework in CopyFiles */,
-				2BDF4D84166D7F0F0054E77F /* SDL_ttf.framework in CopyFiles */,
-				2BDF4D85166D7F120054E77F /* SDL.framework in CopyFiles */,
+				2BDF4D81166D7F060054E77F /* SDL_image.framework in Copy Files */,
+				2BDF4D82166D7F090054E77F /* SDL_mixer.framework in Copy Files */,
+				2BDF4D83166D7F0D0054E77F /* SDL_net.framework in Copy Files */,
+				2BDF4D84166D7F0F0054E77F /* SDL_ttf.framework in Copy Files */,
+				2BDF4D85166D7F120054E77F /* SDL.framework in Copy Files */,
 			);
+			name = "Copy Files";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		2BDF4D86166D88400054E77F /* CopyFiles */ = {
@@ -1268,9 +1267,8 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		2B17132F1686A98C002E9493 /* ManaPlus 10.6.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ManaPlus 10.6.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		2B17132F1686A98C002E9493 /* ManaPlus10.6.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ManaPlus10.6.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		2B1713311686A98C002E9493 /* ManaPlus-10.6-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "ManaPlus-10.6-Info.plist"; path = "/Volumes/User/philippe_groarke/Documents/XCode/socapexs-manaplus/Xcode/ManaPlus-10.6-Info.plist"; sourceTree = "<absolute>"; };
-		2B4EBD01166DE12200BDD105 /* locale */ = {isa = PBXFileReference; lastKnownFileType = folder; path = locale; sourceTree = SOURCE_ROOT; };
 		2B8B70C9167EBCB3003A8440 /* popuplist.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = popuplist.cpp; sourceTree = "<group>"; };
 		2B8B70CA167EBCB3003A8440 /* popuplist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = popuplist.h; sourceTree = "<group>"; };
 		2B8B70CC167EBE3A003A8440 /* setup_touch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_touch.cpp; sourceTree = "<group>"; };
@@ -2191,7 +2189,7 @@
 			children = (
 				2BDF45BF166D5AEC0054E77F /* ManaPlus.app */,
 				2BDF45E0166D5AEC0054E77F /* ManaPlusTests.octest */,
-				2B17132F1686A98C002E9493 /* ManaPlus 10.6.app */,
+				2B17132F1686A98C002E9493 /* ManaPlus10.6.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -2275,7 +2273,6 @@
 				2BDF4778166D5B680054E77F /* configlistener.h */,
 				2BDF4779166D5B680054E77F /* configuration.cpp */,
 				2BDF477A166D5B680054E77F /* configuration.h */,
-				2B4EBD01166DE12200BDD105 /* locale */,
 				2BDF4D75166D781C0054E77F /* data */,
 				2BDF477B166D5B680054E77F /* debug */,
 				2BDF4780166D5B680054E77F /* debug.h */,
@@ -3244,8 +3241,9 @@
 				2B17130B1686A98C002E9493 /* Resources */,
 				2B1713121686A98C002E9493 /* CopyFiles */,
 				2B1713181686A98C002E9493 /* CopyFiles */,
-				2B17132B1686A98C002E9493 /* ShellScript */,
-				2BDB77BB16870F00006DDD51 /* ShellScript */,
+				2B17132B1686A98C002E9493 /* Dylib Script */,
+				2BDB77BB16870F00006DDD51 /* Version Script */,
+				2B9D5589168A6458006F8F06 /* Localization Script */,
 			);
 			buildRules = (
 			);
@@ -3253,7 +3251,7 @@
 			);
 			name = "ManaPlus 10.6";
 			productName = ManaPlus;
-			productReference = 2B17132F1686A98C002E9493 /* ManaPlus 10.6.app */;
+			productReference = 2B17132F1686A98C002E9493 /* ManaPlus10.6.app */;
 			productType = "com.apple.product-type.application";
 		};
 		2BDF45BE166D5AEC0054E77F /* ManaPlus */ = {
@@ -3263,10 +3261,11 @@
 				2BDF45BB166D5AEC0054E77F /* Sources */,
 				2BDF45BC166D5AEC0054E77F /* Frameworks */,
 				2BDF45BD166D5AEC0054E77F /* Resources */,
-				2BDF4D77166D7EA00054E77F /* CopyFiles */,
+				2BDF4D77166D7EA00054E77F /* Copy Files */,
 				2BDF4D86166D88400054E77F /* CopyFiles */,
-				2BDF4DA7166D96290054E77F /* ShellScript */,
-				2BDB77BC16870F36006DDD51 /* ShellScript */,
+				2BDF4DA7166D96290054E77F /* Dylib Script */,
+				2BDB77BC16870F36006DDD51 /* Version Script */,
+				2B514F87168A49F900AAF381 /* Localization Script */,
 			);
 			buildRules = (
 			);
@@ -3334,7 +3333,6 @@
 				2B17130E1686A98C002E9493 /* MainMenu.xib in Resources */,
 				2B17130F1686A98C002E9493 /* data in Resources */,
 				2B1713101686A98C002E9493 /* manaplus.icns in Resources */,
-				2B1713111686A98C002E9493 /* locale in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3347,7 +3345,6 @@
 				2BDF45DA166D5AEC0054E77F /* MainMenu.xib in Resources */,
 				2BDF4D76166D783A0054E77F /* data in Resources */,
 				2BAC2B44166DB4B300874178 /* manaplus.icns in Resources */,
-				2B4EBD02166DE12200BDD105 /* locale in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3362,45 +3359,76 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		2B17132B1686A98C002E9493 /* ShellScript */ = {
+		2B17132B1686A98C002E9493 /* Dylib Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
+			name = "Dylib Script";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "install_name_tool -change /usr/lib/libcurl.4.dylib @executable_path/../SharedSupport/libcurl.4.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\ninstall_name_tool -change /opt/local/lib/libSDL_gfx.14.dylib @executable_path/../SharedSupport/libSDL_gfx.14.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\ninstall_name_tool -change /opt/local/lib/libpng15.15.dylib @executable_path/../SharedSupport/libpng15.15.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\ninstall_name_tool -change /opt/local/lib/libphysfs.1.dylib @executable_path/../SharedSupport/libphysfs.2.0.2.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\n#install_name_tool -change /opt/local/lib/libintl.8.dylib @executable_path/../SharedSupport/libintl.8.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\ninstall_name_tool -change /opt/local/lib/libiconv.2.dylib @executable_path/../SharedSupport/libiconv.2.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\ninstall_name_tool -change /opt/local/lib/libfreetype.6.dylib @executable_path/../SharedSupport/libfreetype.6.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\ninstall_name_tool -change /opt/local/lib/libxml2.2.dylib @executable_path/../SharedSupport/libxml2.2.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\ninstall_name_tool -change /opt/local/lib/libz.1.dylib @executable_path/../SharedSupport/libz.1.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\n";
 		};
-		2BDB77BB16870F00006DDD51 /* ShellScript */ = {
+		2B514F87168A49F900AAF381 /* Localization Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
+			name = "Localization Script";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Update the CFBundleShortVersionString in the generated Info.plist using the most recent Git tag.\n# Idea taken from http://tinyurl.com/3usjj9d by Joachim Bondo.\n\n# Get the current release description from Git.\nGIT_RELEASE_VERSION=`git describe --tags --abbrev=0`\n\n# Set the CFBundleShortVersionString in the generated Info.plist (stripping off the leading \"v\").\ndefaults write \"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH%.*}\" \"CFBundleShortVersionString\" \"${GIT_RELEASE_VERSION#*v}\"";
+			shellScript = "# Localisation script\n\n# Xcode uses a different .bash_profile it seems\n# This is macports path\nexport PATH=/opt/local/bin:/opt/local/sbin:$PATH\n\nfor i in `grep -v ^# ../po/LINGUAS`\ndo\nmkdir -p locale/$i/LC_MESSAGES\nmsgfmt -c -o locale/$i/LC_MESSAGES/manaplus.mo ../po/$i.po\ndone\n\ncp -r locale $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/locale\nrm -r locale";
+		};
+		2B9D5589168A6458006F8F06 /* Localization Script */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Localization Script";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "# Localisation script\n\n# Xcode uses a different .bash_profile it seems\n# This is macports path\nexport PATH=/opt/local/bin:/opt/local/sbin:$PATH\n\nfor i in `grep -v ^# ../po/LINGUAS`\ndo\nmkdir -p locale/$i/LC_MESSAGES\nmsgfmt -c -o locale/$i/LC_MESSAGES/manaplus.mo ../po/$i.po\ndone\n\ncp -r locale $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/\nrm -r locale";
 		};
-		2BDB77BC16870F36006DDD51 /* ShellScript */ = {
+		2BDB77BB16870F00006DDD51 /* Version Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
+			name = "Version Script";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "# Update the CFBundleShortVersionString in the generated Info.plist using the most recent Git tag.\n# Idea taken from http://tinyurl.com/3usjj9d by Joachim Bondo.\n\n# Get the current release description from Git.\nGIT_RELEASE_VERSION=`git describe --tags --abbrev=0`\n\n# Set the CFBundleShortVersionString in the generated Info.plist (stripping off the leading \"v\").\ndefaults write \"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH%.*}\" \"CFBundleShortVersionString\" \"${GIT_RELEASE_VERSION#*v}\"";
 		};
+		2BDB77BC16870F36006DDD51 /* Version Script */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Version Script";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "# Version script\n\n# Update the CFBundleShortVersionString in the generated Info.plist using the most recent Git tag.\n# Idea taken from http://tinyurl.com/3usjj9d by Joachim Bondo.\n\n# Get the current release description from Git.\nGIT_RELEASE_VERSION=`git describe --tags --abbrev=0`\n\n# Set the CFBundleShortVersionString in the generated Info.plist (stripping off the leading \"v\").\ndefaults write \"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH%.*}\" \"CFBundleShortVersionString\" \"${GIT_RELEASE_VERSION#*v}\"";
+		};
 		2BDF45DE166D5AEC0054E77F /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -3414,18 +3442,19 @@
 			shellPath = /bin/sh;
 			shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n";
 		};
-		2BDF4DA7166D96290054E77F /* ShellScript */ = {
+		2BDF4DA7166D96290054E77F /* Dylib Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
+			name = "Dylib Script";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "install_name_tool -change /usr/lib/libcurl.4.dylib @executable_path/../SharedSupport/libcurl.4.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\ninstall_name_tool -change /opt/local/lib/libSDL_gfx.14.dylib @executable_path/../SharedSupport/libSDL_gfx.14.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\ninstall_name_tool -change /opt/local/lib/libpng15.15.dylib @executable_path/../SharedSupport/libpng15.15.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\ninstall_name_tool -change /opt/local/lib/libphysfs.1.dylib @executable_path/../SharedSupport/libphysfs.2.0.2.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\n#install_name_tool -change /opt/local/lib/libintl.8.dylib @executable_path/../SharedSupport/libintl.8.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\ninstall_name_tool -change /opt/local/lib/libiconv.2.dylib @executable_path/../SharedSupport/libiconv.2.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\ninstall_name_tool -change /opt/local/lib/libfreetype.6.dylib @executable_path/../SharedSupport/libfreetype.6.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\ninstall_name_tool -change /opt/local/lib/libxml2.2.dylib @executable_path/../SharedSupport/libxml2.2.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\ninstall_name_tool -change /opt/local/lib/libz.1.dylib @executable_path/../SharedSupport/libz.1.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\n";
+			shellScript = "# dylib script\n\ninstall_name_tool -change /usr/lib/libcurl.4.dylib @executable_path/../SharedSupport/libcurl.4.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\ninstall_name_tool -change /opt/local/lib/libSDL_gfx.14.dylib @executable_path/../SharedSupport/libSDL_gfx.14.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\ninstall_name_tool -change /opt/local/lib/libpng15.15.dylib @executable_path/../SharedSupport/libpng15.15.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\ninstall_name_tool -change /opt/local/lib/libphysfs.1.dylib @executable_path/../SharedSupport/libphysfs.2.0.2.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\n#install_name_tool -change /opt/local/lib/libintl.8.dylib @executable_path/../SharedSupport/libintl.8.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\ninstall_name_tool -change /opt/local/lib/libiconv.2.dylib @executable_path/../SharedSupport/libiconv.2.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\ninstall_name_tool -change /opt/local/lib/libfreetype.6.dylib @executable_path/../SharedSupport/libfreetype.6.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\ninstall_name_tool -change /opt/local/lib/libxml2.2.dylib @executable_path/../SharedSupport/libxml2.2.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\ninstall_name_tool -change /opt/local/lib/libz.1.dylib @executable_path/../SharedSupport/libz.1.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -4608,7 +4637,7 @@
 					"-DUSE_OPENGL",
 				);
 				OTHER_LDFLAGS = "$(SRCROOT)/libs/libintl.a";
-				PRODUCT_NAME = "ManaPlus 10.6";
+				PRODUCT_NAME = ManaPlus10.6;
 				SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
 				USER_HEADER_SEARCH_PATHS = "";
 				VALID_ARCHS = "i386 x86_64";
@@ -4656,7 +4685,7 @@
 					"-DUSE_OPENGL",
 				);
 				OTHER_LDFLAGS = "$(SRCROOT)/libs/libintl.a";
-				PRODUCT_NAME = "ManaPlus 10.6";
+				PRODUCT_NAME = ManaPlus10.6;
 				SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
 				USER_HEADER_SEARCH_PATHS = "";
 				VALID_ARCHS = "i386 x86_64";
diff --git a/Xcode/Release/Release 10.6.dmgCanvas/Disk Image b/Xcode/Release/Release 10.6.dmgCanvas/Disk Image
index e3f52209e..ac3c1f5ec 100644
--- a/Xcode/Release/Release 10.6.dmgCanvas/Disk Image
+++ b/Xcode/Release/Release 10.6.dmgCanvas/Disk Image
diff --git a/Xcode/Release/Release.dmgCanvas/Disk Image b/Xcode/Release/Release.dmgCanvas/Disk Image
index da7e05e25..11f372249 100644
--- a/Xcode/Release/Release.dmgCanvas/Disk Image
+++ b/Xcode/Release/Release.dmgCanvas/Disk Image
diff --git a/Xcode/Release/ManaPlus 2.icns b/Xcode/Release/manaplus2.icns
index db266f359..db266f359 100644
--- a/Xcode/Release/ManaPlus 2.icns
+++ b/Xcode/Release/manaplus2.icns
diff --git a/Xcode/locale/cs/LC_MESSAGES/manaplus.mo b/Xcode/locale/cs/LC_MESSAGES/manaplus.mo
deleted file mode 100644
index 491d7e02b..000000000
--- a/Xcode/locale/cs/LC_MESSAGES/manaplus.mo
+++ /dev/null
diff --git a/Xcode/locale/da/LC_MESSAGES/manaplus.mo b/Xcode/locale/da/LC_MESSAGES/manaplus.mo
deleted file mode 100644
index 424a97b5d..000000000
--- a/Xcode/locale/da/LC_MESSAGES/manaplus.mo
+++ /dev/null
diff --git a/Xcode/locale/de/LC_MESSAGES/manaplus.mo b/Xcode/locale/de/LC_MESSAGES/manaplus.mo
deleted file mode 100644
index 86da1f53d..000000000
--- a/Xcode/locale/de/LC_MESSAGES/manaplus.mo
+++ /dev/null
diff --git a/Xcode/locale/en_GB/LC_MESSAGES/manaplus.mo b/Xcode/locale/en_GB/LC_MESSAGES/manaplus.mo
deleted file mode 100644
index 5f4ef1362..000000000
--- a/Xcode/locale/en_GB/LC_MESSAGES/manaplus.mo
+++ /dev/null
diff --git a/Xcode/locale/es/LC_MESSAGES/manaplus.mo b/Xcode/locale/es/LC_MESSAGES/manaplus.mo
deleted file mode 100644
index 3ef49a682..000000000
--- a/Xcode/locale/es/LC_MESSAGES/manaplus.mo
+++ /dev/null
diff --git a/Xcode/locale/fi/LC_MESSAGES/manaplus.mo b/Xcode/locale/fi/LC_MESSAGES/manaplus.mo
deleted file mode 100644
index 89281c684..000000000
--- a/Xcode/locale/fi/LC_MESSAGES/manaplus.mo
+++ /dev/null
diff --git a/Xcode/locale/fr/LC_MESSAGES/manaplus.mo b/Xcode/locale/fr/LC_MESSAGES/manaplus.mo
deleted file mode 100644
index 65f4ec77b..000000000
--- a/Xcode/locale/fr/LC_MESSAGES/manaplus.mo
+++ /dev/null
diff --git a/Xcode/locale/hr/LC_MESSAGES/manaplus.mo b/Xcode/locale/hr/LC_MESSAGES/manaplus.mo
deleted file mode 100644
index 384ca030f..000000000
--- a/Xcode/locale/hr/LC_MESSAGES/manaplus.mo
+++ /dev/null
diff --git a/Xcode/locale/hu/LC_MESSAGES/manaplus.mo b/Xcode/locale/hu/LC_MESSAGES/manaplus.mo
deleted file mode 100644
index c01430238..000000000
--- a/Xcode/locale/hu/LC_MESSAGES/manaplus.mo
+++ /dev/null
diff --git a/Xcode/locale/id/LC_MESSAGES/manaplus.mo b/Xcode/locale/id/LC_MESSAGES/manaplus.mo
deleted file mode 100644
index ef62f5dc0..000000000
--- a/Xcode/locale/id/LC_MESSAGES/manaplus.mo
+++ /dev/null
diff --git a/Xcode/locale/it/LC_MESSAGES/manaplus.mo b/Xcode/locale/it/LC_MESSAGES/manaplus.mo
deleted file mode 100644
index bb11dbe05..000000000
--- a/Xcode/locale/it/LC_MESSAGES/manaplus.mo
+++ /dev/null
diff --git a/Xcode/locale/ja/LC_MESSAGES/manaplus.mo b/Xcode/locale/ja/LC_MESSAGES/manaplus.mo
deleted file mode 100644
index 5ac11cad7..000000000
--- a/Xcode/locale/ja/LC_MESSAGES/manaplus.mo
+++ /dev/null
diff --git a/Xcode/locale/nl/LC_MESSAGES/manaplus.mo b/Xcode/locale/nl/LC_MESSAGES/manaplus.mo
deleted file mode 100644
index f3d81b346..000000000
--- a/Xcode/locale/nl/LC_MESSAGES/manaplus.mo
+++ /dev/null
diff --git a/Xcode/locale/nl_BE/LC_MESSAGES/manaplus.mo b/Xcode/locale/nl_BE/LC_MESSAGES/manaplus.mo
deleted file mode 100644
index 54bf52589..000000000
--- a/Xcode/locale/nl_BE/LC_MESSAGES/manaplus.mo
+++ /dev/null
diff --git a/Xcode/locale/pl/LC_MESSAGES/manaplus.mo b/Xcode/locale/pl/LC_MESSAGES/manaplus.mo
deleted file mode 100644
index 2964cd997..000000000
--- a/Xcode/locale/pl/LC_MESSAGES/manaplus.mo
+++ /dev/null
diff --git a/Xcode/locale/pt/LC_MESSAGES/manaplus.mo b/Xcode/locale/pt/LC_MESSAGES/manaplus.mo
deleted file mode 100644
index 7f97bc806..000000000
--- a/Xcode/locale/pt/LC_MESSAGES/manaplus.mo
+++ /dev/null
diff --git a/Xcode/locale/pt_BR/LC_MESSAGES/manaplus.mo b/Xcode/locale/pt_BR/LC_MESSAGES/manaplus.mo
deleted file mode 100644
index f84e384df..000000000
--- a/Xcode/locale/pt_BR/LC_MESSAGES/manaplus.mo
+++ /dev/null
diff --git a/Xcode/locale/ru/LC_MESSAGES/manaplus.mo b/Xcode/locale/ru/LC_MESSAGES/manaplus.mo
deleted file mode 100644
index 89c2742e1..000000000
--- a/Xcode/locale/ru/LC_MESSAGES/manaplus.mo
+++ /dev/null
diff --git a/Xcode/locale/sv/LC_MESSAGES/manaplus.mo b/Xcode/locale/sv/LC_MESSAGES/manaplus.mo
deleted file mode 100644
index 2a1384d6f..000000000
--- a/Xcode/locale/sv/LC_MESSAGES/manaplus.mo
+++ /dev/null
diff --git a/Xcode/locale/zh_CN/LC_MESSAGES/manaplus.mo b/Xcode/locale/zh_CN/LC_MESSAGES/manaplus.mo
deleted file mode 100644
index c97c80ade..000000000
--- a/Xcode/locale/zh_CN/LC_MESSAGES/manaplus.mo
+++ /dev/null