diff options
19 files changed, 32 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 99144e284..e06051fd8 100644 --- a/.gitignore +++ b/.gitignore @@ -149,3 +149,4 @@ Xcode/ManaPlus.xcodeproj/xcuserdata Xcode/ManaPlus.xcodeproj/project.xcworkspace/xcuserdata Xcode/Release/ManaPlus.dmg Xcode/Release/ManaPlus-10.6.dmg +Xcode/Release/ManaPlus-10.7+.dmg diff --git a/Xcode/ManaPlus-10.6-Info.plist b/Xcode/ManaPlus-10.6-Info.plist index 56ff6c102..4b07f8cf4 100644 --- a/Xcode/ManaPlus-10.6-Info.plist +++ b/Xcode/ManaPlus-10.6-Info.plist @@ -17,7 +17,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.2.12.9</string> + <string>1.2.12.23</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> diff --git a/Xcode/ManaPlus.xcodeproj/project.pbxproj b/Xcode/ManaPlus.xcodeproj/project.pbxproj index 31ad712a6..babbdd237 100644 --- a/Xcode/ManaPlus.xcodeproj/project.pbxproj +++ b/Xcode/ManaPlus.xcodeproj/project.pbxproj @@ -3245,6 +3245,7 @@ 2B1713121686A98C002E9493 /* CopyFiles */, 2B1713181686A98C002E9493 /* CopyFiles */, 2B17132B1686A98C002E9493 /* ShellScript */, + 2BDB77BB16870F00006DDD51 /* ShellScript */, ); buildRules = ( ); @@ -3265,6 +3266,7 @@ 2BDF4D77166D7EA00054E77F /* CopyFiles */, 2BDF4D86166D88400054E77F /* CopyFiles */, 2BDF4DA7166D96290054E77F /* ShellScript */, + 2BDB77BC16870F36006DDD51 /* ShellScript */, ); buildRules = ( ); @@ -3373,6 +3375,32 @@ 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 */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + 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 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + 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}\""; + }; 2BDF45DE166D5AEC0054E77F /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/Xcode/ManaPlus/ManaPlus-Info.plist b/Xcode/ManaPlus/ManaPlus-Info.plist index 56ff6c102..533b9b505 100644 --- a/Xcode/ManaPlus/ManaPlus-Info.plist +++ b/Xcode/ManaPlus/ManaPlus-Info.plist @@ -17,7 +17,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.2.12.9</string> + <string>1</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> diff --git a/Xcode/locale/cs/LC_MESSAGES/manaplus.mo b/Xcode/locale/cs/LC_MESSAGES/manaplus.mo Binary files differindex 22ed5b285..491d7e02b 100644 --- a/Xcode/locale/cs/LC_MESSAGES/manaplus.mo +++ b/Xcode/locale/cs/LC_MESSAGES/manaplus.mo diff --git a/Xcode/locale/de/LC_MESSAGES/manaplus.mo b/Xcode/locale/de/LC_MESSAGES/manaplus.mo Binary files differindex 3d51c6f35..86da1f53d 100644 --- a/Xcode/locale/de/LC_MESSAGES/manaplus.mo +++ b/Xcode/locale/de/LC_MESSAGES/manaplus.mo diff --git a/Xcode/locale/es/LC_MESSAGES/manaplus.mo b/Xcode/locale/es/LC_MESSAGES/manaplus.mo Binary files differindex 47a930cf1..3ef49a682 100644 --- a/Xcode/locale/es/LC_MESSAGES/manaplus.mo +++ b/Xcode/locale/es/LC_MESSAGES/manaplus.mo diff --git a/Xcode/locale/fi/LC_MESSAGES/manaplus.mo b/Xcode/locale/fi/LC_MESSAGES/manaplus.mo Binary files differindex 3ffb6f32b..89281c684 100644 --- a/Xcode/locale/fi/LC_MESSAGES/manaplus.mo +++ b/Xcode/locale/fi/LC_MESSAGES/manaplus.mo diff --git a/Xcode/locale/fr/LC_MESSAGES/manaplus.mo b/Xcode/locale/fr/LC_MESSAGES/manaplus.mo Binary files differindex 8e301f27d..65f4ec77b 100644 --- a/Xcode/locale/fr/LC_MESSAGES/manaplus.mo +++ b/Xcode/locale/fr/LC_MESSAGES/manaplus.mo diff --git a/Xcode/locale/id/LC_MESSAGES/manaplus.mo b/Xcode/locale/id/LC_MESSAGES/manaplus.mo Binary files differindex bb8fa2ecb..ef62f5dc0 100644 --- a/Xcode/locale/id/LC_MESSAGES/manaplus.mo +++ b/Xcode/locale/id/LC_MESSAGES/manaplus.mo diff --git a/Xcode/locale/it/LC_MESSAGES/manaplus.mo b/Xcode/locale/it/LC_MESSAGES/manaplus.mo Binary files differindex 0ebc656de..bb11dbe05 100644 --- a/Xcode/locale/it/LC_MESSAGES/manaplus.mo +++ b/Xcode/locale/it/LC_MESSAGES/manaplus.mo diff --git a/Xcode/locale/ja/LC_MESSAGES/manaplus.mo b/Xcode/locale/ja/LC_MESSAGES/manaplus.mo Binary files differindex 0df62e4b1..5ac11cad7 100644 --- a/Xcode/locale/ja/LC_MESSAGES/manaplus.mo +++ b/Xcode/locale/ja/LC_MESSAGES/manaplus.mo diff --git a/Xcode/locale/nl_BE/LC_MESSAGES/manaplus.mo b/Xcode/locale/nl_BE/LC_MESSAGES/manaplus.mo Binary files differindex 47469cae5..54bf52589 100644 --- a/Xcode/locale/nl_BE/LC_MESSAGES/manaplus.mo +++ b/Xcode/locale/nl_BE/LC_MESSAGES/manaplus.mo diff --git a/Xcode/locale/pl/LC_MESSAGES/manaplus.mo b/Xcode/locale/pl/LC_MESSAGES/manaplus.mo Binary files differindex fac449c25..2964cd997 100644 --- a/Xcode/locale/pl/LC_MESSAGES/manaplus.mo +++ b/Xcode/locale/pl/LC_MESSAGES/manaplus.mo diff --git a/Xcode/locale/pt/LC_MESSAGES/manaplus.mo b/Xcode/locale/pt/LC_MESSAGES/manaplus.mo Binary files differindex 13a8c9d5a..7f97bc806 100644 --- a/Xcode/locale/pt/LC_MESSAGES/manaplus.mo +++ b/Xcode/locale/pt/LC_MESSAGES/manaplus.mo diff --git a/Xcode/locale/pt_BR/LC_MESSAGES/manaplus.mo b/Xcode/locale/pt_BR/LC_MESSAGES/manaplus.mo Binary files differindex 4617acdc2..f84e384df 100644 --- a/Xcode/locale/pt_BR/LC_MESSAGES/manaplus.mo +++ b/Xcode/locale/pt_BR/LC_MESSAGES/manaplus.mo diff --git a/Xcode/locale/ru/LC_MESSAGES/manaplus.mo b/Xcode/locale/ru/LC_MESSAGES/manaplus.mo Binary files differindex 9065d73a5..89c2742e1 100644 --- a/Xcode/locale/ru/LC_MESSAGES/manaplus.mo +++ b/Xcode/locale/ru/LC_MESSAGES/manaplus.mo diff --git a/Xcode/locale/zh_CN/LC_MESSAGES/manaplus.mo b/Xcode/locale/zh_CN/LC_MESSAGES/manaplus.mo Binary files differindex dcde050fb..c97c80ade 100644 --- a/Xcode/locale/zh_CN/LC_MESSAGES/manaplus.mo +++ b/Xcode/locale/zh_CN/LC_MESSAGES/manaplus.mo diff --git a/src/main.h b/src/main.h index e7641235f..d80f7a409 100644 --- a/src/main.h +++ b/src/main.h @@ -57,7 +57,7 @@ #endif #if defined __APPLE__ -#define PACKAGE_OS "Mac OSX" +#define PACKAGE_OS "Mac OS X" #elif defined(__ANDROID__) || defined(ANDROID) #define PACKAGE_OS "Android" #elif defined __FreeBSD__ || defined __DragonFly__ |