summaryrefslogtreecommitdiff
path: root/Xcode
diff options
context:
space:
mode:
authorSocapex <philippe_groarke@yahoo.ca>2013-02-22 17:27:29 -0500
committerAndrei Karas <akaras@inbox.ru>2013-02-24 15:18:40 +0300
commitcd64632d3824cd4db1a540a625988c93fcf4f8bd (patch)
tree820f7cf68a39223f9880e7ad25c88af9a1031c22 /Xcode
parentbcde3a79a38aba8ca9e3ab7f4dea13ad8da33a54 (diff)
downloadmv-cd64632d3824cd4db1a540a625988c93fcf4f8bd.tar.gz
mv-cd64632d3824cd4db1a540a625988c93fcf4f8bd.tar.bz2
mv-cd64632d3824cd4db1a540a625988c93fcf4f8bd.tar.xz
mv-cd64632d3824cd4db1a540a625988c93fcf4f8bd.zip
Updated libpng and changed it to static lib. Updated .gitignore.
Diffstat (limited to 'Xcode')
-rw-r--r--Xcode/ManaPlus-10.6-Info.plist4
-rw-r--r--Xcode/ManaPlus.xcodeproj/project.pbxproj14
-rw-r--r--Xcode/ManaPlus/ManaPlus-Info.plist2
-rw-r--r--Xcode/libs/libpng15.abin0 -> 452624 bytes
4 files changed, 11 insertions, 9 deletions
diff --git a/Xcode/ManaPlus-10.6-Info.plist b/Xcode/ManaPlus-10.6-Info.plist
index 0a73077f4..11a2676fa 100644
--- a/Xcode/ManaPlus-10.6-Info.plist
+++ b/Xcode/ManaPlus-10.6-Info.plist
@@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.2.12.23</string>
+ <string>1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2</string>
+ <string>4</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.role-playing-games</string>
<key>LSMinimumSystemVersion</key>
diff --git a/Xcode/ManaPlus.xcodeproj/project.pbxproj b/Xcode/ManaPlus.xcodeproj/project.pbxproj
index d889fd157..cbd9eb9e8 100644
--- a/Xcode/ManaPlus.xcodeproj/project.pbxproj
+++ b/Xcode/ManaPlus.xcodeproj/project.pbxproj
@@ -404,7 +404,6 @@
2B1713241686A98C002E9493 /* libphysfs.2.0.2.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BDF4DA8166D99320054E77F /* libphysfs.2.0.2.dylib */; };
2B1713251686A98C002E9493 /* libz.1.2.7.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BDF4D96166D8E0D0054E77F /* libz.1.2.7.dylib */; };
2B1713261686A98C002E9493 /* libxml2.2.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BDF4D95166D8E0D0054E77F /* libxml2.2.dylib */; };
- 2B1713271686A98C002E9493 /* libpng15.15.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BDF4D93166D8E0D0054E77F /* libpng15.15.dylib */; };
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 */; };
@@ -1163,7 +1162,6 @@
2BDF4D9E166D8E0D0054E77F /* libz.1.2.7.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BDF4D96166D8E0D0054E77F /* libz.1.2.7.dylib */; };
2BDF4D9F166D8E2C0054E77F /* libfreetype.6.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BDF4D8F166D8E0C0054E77F /* libfreetype.6.dylib */; };
2BDF4DA0166D8E2F0054E77F /* libiconv.2.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BDF4D90166D8E0C0054E77F /* libiconv.2.dylib */; };
- 2BDF4DA3166D8E370054E77F /* libpng15.15.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BDF4D93166D8E0D0054E77F /* libpng15.15.dylib */; };
2BDF4DA4166D8E3C0054E77F /* libSDL_gfx.14.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BDF4D94166D8E0D0054E77F /* libSDL_gfx.14.dylib */; };
2BDF4DA5166D8E3E0054E77F /* libxml2.2.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BDF4D95166D8E0D0054E77F /* libxml2.2.dylib */; };
2BDF4DA6166D8E410054E77F /* libz.1.2.7.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BDF4D96166D8E0D0054E77F /* libz.1.2.7.dylib */; };
@@ -1217,7 +1215,6 @@
2B1713241686A98C002E9493 /* libphysfs.2.0.2.dylib in CopyFiles */,
2B1713251686A98C002E9493 /* libz.1.2.7.dylib in CopyFiles */,
2B1713261686A98C002E9493 /* libxml2.2.dylib in CopyFiles */,
- 2B1713271686A98C002E9493 /* libpng15.15.dylib in CopyFiles */,
2B1713281686A98C002E9493 /* libSDL_gfx.14.dylib in CopyFiles */,
2B1713291686A98C002E9493 /* libfreetype.6.dylib in CopyFiles */,
2B17132A1686A98C002E9493 /* libiconv.2.dylib in CopyFiles */,
@@ -1259,7 +1256,6 @@
2BDF4DAA166D99410054E77F /* libphysfs.2.0.2.dylib in CopyFiles */,
2BDF4DA6166D8E410054E77F /* libz.1.2.7.dylib in CopyFiles */,
2BDF4DA5166D8E3E0054E77F /* libxml2.2.dylib in CopyFiles */,
- 2BDF4DA3166D8E370054E77F /* libpng15.15.dylib in CopyFiles */,
2BDF4DA4166D8E3C0054E77F /* libSDL_gfx.14.dylib in CopyFiles */,
2BDF4D9F166D8E2C0054E77F /* libfreetype.6.dylib in CopyFiles */,
2BDF4DA0166D8E2F0054E77F /* libiconv.2.dylib in CopyFiles */,
@@ -1273,6 +1269,7 @@
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>"; };
2B43647816AB8BE40034DAC2 /* setuptouchitem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setuptouchitem.cpp; sourceTree = "<group>"; };
2B43647916AB8BE40034DAC2 /* setuptouchitem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setuptouchitem.h; sourceTree = "<group>"; };
+ 2B57D0AD16D81F1800F0B9D0 /* libpng15.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng15.a; path = libs/libpng15.a; sourceTree = "<group>"; };
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>"; };
@@ -2209,6 +2206,7 @@
2BDF4D94166D8E0D0054E77F /* libSDL_gfx.14.dylib */,
2BDF4D95166D8E0D0054E77F /* libxml2.2.dylib */,
2BDF4D96166D8E0D0054E77F /* libz.1.2.7.dylib */,
+ 2B57D0AD16D81F1800F0B9D0 /* libpng15.a */,
2BC90AA916855F8000FE7AD3 /* libintl.a */,
2BDF4D54166D5DCD0054E77F /* OpenGL.framework */,
2BDF4D4A166D5D9E0054E77F /* SDL_image.framework */,
@@ -3375,7 +3373,7 @@
);
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 = "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\"\n# install_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";
};
2B514F87168A49F900AAF381 /* Localization Script */ = {
isa = PBXShellScriptBuildPhase;
@@ -3458,7 +3456,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- 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";
+ 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\"\n# install_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 */
@@ -4643,6 +4641,7 @@
"-DUSE_OPENGL",
);
OTHER_LDFLAGS = (
+ "$(SRCROOT)/libs/libpng15.a",
"$(SRCROOT)/libs/libintl.a",
"-headerpad_max_install_names",
);
@@ -4694,6 +4693,7 @@
"-DUSE_OPENGL",
);
OTHER_LDFLAGS = (
+ "$(SRCROOT)/libs/libpng15.a",
"$(SRCROOT)/libs/libintl.a",
"-headerpad_max_install_names",
);
@@ -4797,6 +4797,7 @@
"-DENABLE_NLS",
);
OTHER_LDFLAGS = (
+ "$(SRCROOT)/libs/libpng15.a",
"$(SRCROOT)/libs/libintl.a",
"-headerpad_max_install_names",
);
@@ -4849,6 +4850,7 @@
"-DENABLE_NLS",
);
OTHER_LDFLAGS = (
+ "$(SRCROOT)/libs/libpng15.a",
"$(SRCROOT)/libs/libintl.a",
"-headerpad_max_install_names",
);
diff --git a/Xcode/ManaPlus/ManaPlus-Info.plist b/Xcode/ManaPlus/ManaPlus-Info.plist
index 569d4daea..11a2676fa 100644
--- a/Xcode/ManaPlus/ManaPlus-Info.plist
+++ b/Xcode/ManaPlus/ManaPlus-Info.plist
@@ -21,7 +21,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>3</string>
+ <string>4</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.role-playing-games</string>
<key>LSMinimumSystemVersion</key>
diff --git a/Xcode/libs/libpng15.a b/Xcode/libs/libpng15.a
new file mode 100644
index 000000000..fb33bd27f
--- /dev/null
+++ b/Xcode/libs/libpng15.a
Binary files differ