diff --git a/stepmania/PBProject/Libraries/Libraries.xcode/project.pbxproj b/stepmania/PBProject/Libraries/Libraries.xcode/project.pbxproj index c7ab97bf6d..fb6e8ddd55 100644 --- a/stepmania/PBProject/Libraries/Libraries.xcode/project.pbxproj +++ b/stepmania/PBProject/Libraries/Libraries.xcode/project.pbxproj @@ -53,6 +53,8 @@ AA059E170B8F0A32006F8139 /* zlib.h in Headers */ = {isa = PBXBuildFile; fileRef = AA059DB40B8F0A32006F8139 /* zlib.h */; }; AA059E180B8F0A32006F8139 /* zutil.c in Sources */ = {isa = PBXBuildFile; fileRef = AA059DB50B8F0A32006F8139 /* zutil.c */; }; AA059E190B8F0A32006F8139 /* zutil.h in Headers */ = {isa = PBXBuildFile; fileRef = AA059DB60B8F0A32006F8139 /* zutil.h */; }; + AA059E560B8F10B0006F8139 /* libz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AA059CC90B8F09DB006F8139 /* libz.a */; }; + AA059E570B8F10B8006F8139 /* libz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AA059CC90B8F09DB006F8139 /* libz.a */; }; AA3AE054097B250700575EA1 /* ansi2knr.c in Sources */ = {isa = PBXBuildFile; fileRef = AA3ADFC4097B250700575EA1 /* ansi2knr.c */; }; AA3AE055097B250700575EA1 /* cderror.h in Headers */ = {isa = PBXBuildFile; fileRef = AA3ADFC5097B250700575EA1 /* cderror.h */; }; AA3AE056097B250700575EA1 /* cdjpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = AA3ADFC6097B250700575EA1 /* cdjpeg.c */; }; @@ -702,6 +704,20 @@ remoteGlobalIDString = AA059CC80B8F09DB006F8139 /* z */; remoteInfo = z; }; + AA059E4C0B8F1093006F8139 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = AA059CC80B8F09DB006F8139 /* z */; + remoteInfo = z; + }; + AA059E500B8F109D006F8139 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = AA059CC80B8F09DB006F8139 /* z */; + remoteInfo = z; + }; AA3AE1A8097B473600575EA1 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; @@ -1256,6 +1272,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + AA059E570B8F10B8006F8139 /* libz.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1298,6 +1315,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + AA059E560B8F10B0006F8139 /* libz.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2277,6 +2295,7 @@ ); dependencies = ( AA3AE8B5097B7A5300575EA1 /* PBXTargetDependency */, + AA059E510B8F109D006F8139 /* PBXTargetDependency */, ); name = "ffmpeg-i386"; productName = ffmpeg; @@ -2385,6 +2404,7 @@ AA91AD1E087C609500FB2F8F /* PBXBuildRule */, ); dependencies = ( + AA059E4D0B8F1093006F8139 /* PBXTargetDependency */, ); name = ffmpeg; productName = ffmpeg; @@ -3077,6 +3097,16 @@ target = AA059CC80B8F09DB006F8139 /* z */; targetProxy = AA059E270B8F0BF5006F8139 /* PBXContainerItemProxy */; }; + AA059E4D0B8F1093006F8139 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = AA059CC80B8F09DB006F8139 /* z */; + targetProxy = AA059E4C0B8F1093006F8139 /* PBXContainerItemProxy */; + }; + AA059E510B8F109D006F8139 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = AA059CC80B8F09DB006F8139 /* z */; + targetProxy = AA059E500B8F109D006F8139 /* PBXContainerItemProxy */; + }; AA3AE1A9097B473600575EA1 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = AA3ADFB9097B23BE00575EA1 /* jpeg */; @@ -3245,7 +3275,7 @@ OTHER_LDFLAGS = ( "-seg1addr", 0x2F600000, - "-lz", + "-Wl,-search_paths_first", ); OTHER_REZFLAGS = ""; PER_ARCH_CFLAGS_i386 = "-mmmx -msse3"; @@ -3530,7 +3560,7 @@ OTHER_LDFLAGS = ( "-seg1addr", 0x2F600000, - "-lz", + "-Wl,-search_paths_first", ); OTHER_REZFLAGS = ""; PER_ARCH_CFLAGS_i386 = "-mmmx -msse3"; diff --git a/stepmania/PBProject/Libraries/libjpeg.a b/stepmania/PBProject/Libraries/libjpeg.a index 49bc08d29e..33fe7b0917 100644 Binary files a/stepmania/PBProject/Libraries/libjpeg.a and b/stepmania/PBProject/Libraries/libjpeg.a differ diff --git a/stepmania/PBProject/Libraries/libogg.a b/stepmania/PBProject/Libraries/libogg.a index 4521861975..5c99814438 100644 Binary files a/stepmania/PBProject/Libraries/libogg.a and b/stepmania/PBProject/Libraries/libogg.a differ diff --git a/stepmania/PBProject/Libraries/libpng.a b/stepmania/PBProject/Libraries/libpng.a index 08cc96f11c..0ca2ea62fb 100644 Binary files a/stepmania/PBProject/Libraries/libpng.a and b/stepmania/PBProject/Libraries/libpng.a differ diff --git a/stepmania/PBProject/Libraries/libtheora.a b/stepmania/PBProject/Libraries/libtheora.a index 41696861c2..4490a111b5 100644 Binary files a/stepmania/PBProject/Libraries/libtheora.a and b/stepmania/PBProject/Libraries/libtheora.a differ diff --git a/stepmania/PBProject/Libraries/libvorbis.a b/stepmania/PBProject/Libraries/libvorbis.a index a94722a8b2..7a82356dc2 100644 Binary files a/stepmania/PBProject/Libraries/libvorbis.a and b/stepmania/PBProject/Libraries/libvorbis.a differ