summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSocapex <philippe_groarke@yahoo.ca>2012-12-25 15:23:30 -0500
committerSocapex <philippe_groarke@yahoo.ca>2012-12-25 15:25:15 -0500
commit66224369d28740220a99057f2c81d8f195bc08fa (patch)
tree7c2f3cdc28c7981b320f7ad2e9a8bf81d882c31b
parentd4a14c08b554f80c1e8205660a9b66fc5cff4393 (diff)
downloadplus-66224369d28740220a99057f2c81d8f195bc08fa.tar.gz
plus-66224369d28740220a99057f2c81d8f195bc08fa.tar.bz2
plus-66224369d28740220a99057f2c81d8f195bc08fa.tar.xz
plus-66224369d28740220a99057f2c81d8f195bc08fa.zip
Xcode updates version and minor fixes.
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--Xcode/ManaPlus-10.6-Info.plist2
-rw-r--r--Xcode/ManaPlus.xcodeproj/project.pbxproj28
-rw-r--r--Xcode/ManaPlus/ManaPlus-Info.plist2
-rw-r--r--Xcode/locale/cs/LC_MESSAGES/manaplus.mobin67217 -> 67217 bytes
-rw-r--r--Xcode/locale/de/LC_MESSAGES/manaplus.mobin87349 -> 88903 bytes
-rw-r--r--Xcode/locale/es/LC_MESSAGES/manaplus.mobin90909 -> 90966 bytes
-rw-r--r--Xcode/locale/fi/LC_MESSAGES/manaplus.mobin78670 -> 78300 bytes
-rw-r--r--Xcode/locale/fr/LC_MESSAGES/manaplus.mobin93984 -> 93799 bytes
-rw-r--r--Xcode/locale/id/LC_MESSAGES/manaplus.mobin32608 -> 32608 bytes
-rw-r--r--Xcode/locale/it/LC_MESSAGES/manaplus.mobin72608 -> 72327 bytes
-rw-r--r--Xcode/locale/ja/LC_MESSAGES/manaplus.mobin89080 -> 88516 bytes
-rw-r--r--Xcode/locale/nl_BE/LC_MESSAGES/manaplus.mobin63040 -> 62803 bytes
-rw-r--r--Xcode/locale/pl/LC_MESSAGES/manaplus.mobin86089 -> 87658 bytes
-rw-r--r--Xcode/locale/pt/LC_MESSAGES/manaplus.mobin88557 -> 88101 bytes
-rw-r--r--Xcode/locale/pt_BR/LC_MESSAGES/manaplus.mobin88539 -> 88084 bytes
-rw-r--r--Xcode/locale/ru/LC_MESSAGES/manaplus.mobin113751 -> 114322 bytes
-rw-r--r--Xcode/locale/zh_CN/LC_MESSAGES/manaplus.mobin51523 -> 51157 bytes
-rw-r--r--src/main.h2
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
index 22ed5b285..491d7e02b 100644
--- a/Xcode/locale/cs/LC_MESSAGES/manaplus.mo
+++ b/Xcode/locale/cs/LC_MESSAGES/manaplus.mo
Binary files differ
diff --git a/Xcode/locale/de/LC_MESSAGES/manaplus.mo b/Xcode/locale/de/LC_MESSAGES/manaplus.mo
index 3d51c6f35..86da1f53d 100644
--- a/Xcode/locale/de/LC_MESSAGES/manaplus.mo
+++ b/Xcode/locale/de/LC_MESSAGES/manaplus.mo
Binary files differ
diff --git a/Xcode/locale/es/LC_MESSAGES/manaplus.mo b/Xcode/locale/es/LC_MESSAGES/manaplus.mo
index 47a930cf1..3ef49a682 100644
--- a/Xcode/locale/es/LC_MESSAGES/manaplus.mo
+++ b/Xcode/locale/es/LC_MESSAGES/manaplus.mo
Binary files differ
diff --git a/Xcode/locale/fi/LC_MESSAGES/manaplus.mo b/Xcode/locale/fi/LC_MESSAGES/manaplus.mo
index 3ffb6f32b..89281c684 100644
--- a/Xcode/locale/fi/LC_MESSAGES/manaplus.mo
+++ b/Xcode/locale/fi/LC_MESSAGES/manaplus.mo
Binary files differ
diff --git a/Xcode/locale/fr/LC_MESSAGES/manaplus.mo b/Xcode/locale/fr/LC_MESSAGES/manaplus.mo
index 8e301f27d..65f4ec77b 100644
--- a/Xcode/locale/fr/LC_MESSAGES/manaplus.mo
+++ b/Xcode/locale/fr/LC_MESSAGES/manaplus.mo
Binary files differ
diff --git a/Xcode/locale/id/LC_MESSAGES/manaplus.mo b/Xcode/locale/id/LC_MESSAGES/manaplus.mo
index bb8fa2ecb..ef62f5dc0 100644
--- a/Xcode/locale/id/LC_MESSAGES/manaplus.mo
+++ b/Xcode/locale/id/LC_MESSAGES/manaplus.mo
Binary files differ
diff --git a/Xcode/locale/it/LC_MESSAGES/manaplus.mo b/Xcode/locale/it/LC_MESSAGES/manaplus.mo
index 0ebc656de..bb11dbe05 100644
--- a/Xcode/locale/it/LC_MESSAGES/manaplus.mo
+++ b/Xcode/locale/it/LC_MESSAGES/manaplus.mo
Binary files differ
diff --git a/Xcode/locale/ja/LC_MESSAGES/manaplus.mo b/Xcode/locale/ja/LC_MESSAGES/manaplus.mo
index 0df62e4b1..5ac11cad7 100644
--- a/Xcode/locale/ja/LC_MESSAGES/manaplus.mo
+++ b/Xcode/locale/ja/LC_MESSAGES/manaplus.mo
Binary files differ
diff --git a/Xcode/locale/nl_BE/LC_MESSAGES/manaplus.mo b/Xcode/locale/nl_BE/LC_MESSAGES/manaplus.mo
index 47469cae5..54bf52589 100644
--- a/Xcode/locale/nl_BE/LC_MESSAGES/manaplus.mo
+++ b/Xcode/locale/nl_BE/LC_MESSAGES/manaplus.mo
Binary files differ
diff --git a/Xcode/locale/pl/LC_MESSAGES/manaplus.mo b/Xcode/locale/pl/LC_MESSAGES/manaplus.mo
index fac449c25..2964cd997 100644
--- a/Xcode/locale/pl/LC_MESSAGES/manaplus.mo
+++ b/Xcode/locale/pl/LC_MESSAGES/manaplus.mo
Binary files differ
diff --git a/Xcode/locale/pt/LC_MESSAGES/manaplus.mo b/Xcode/locale/pt/LC_MESSAGES/manaplus.mo
index 13a8c9d5a..7f97bc806 100644
--- a/Xcode/locale/pt/LC_MESSAGES/manaplus.mo
+++ b/Xcode/locale/pt/LC_MESSAGES/manaplus.mo
Binary files differ
diff --git a/Xcode/locale/pt_BR/LC_MESSAGES/manaplus.mo b/Xcode/locale/pt_BR/LC_MESSAGES/manaplus.mo
index 4617acdc2..f84e384df 100644
--- a/Xcode/locale/pt_BR/LC_MESSAGES/manaplus.mo
+++ b/Xcode/locale/pt_BR/LC_MESSAGES/manaplus.mo
Binary files differ
diff --git a/Xcode/locale/ru/LC_MESSAGES/manaplus.mo b/Xcode/locale/ru/LC_MESSAGES/manaplus.mo
index 9065d73a5..89c2742e1 100644
--- a/Xcode/locale/ru/LC_MESSAGES/manaplus.mo
+++ b/Xcode/locale/ru/LC_MESSAGES/manaplus.mo
Binary files differ
diff --git a/Xcode/locale/zh_CN/LC_MESSAGES/manaplus.mo b/Xcode/locale/zh_CN/LC_MESSAGES/manaplus.mo
index dcde050fb..c97c80ade 100644
--- a/Xcode/locale/zh_CN/LC_MESSAGES/manaplus.mo
+++ b/Xcode/locale/zh_CN/LC_MESSAGES/manaplus.mo
Binary files differ
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__
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-28 20:15:59 +0000