Fix crash with newer OS X builds running on older.

Use built-in zlib sources instead of system zlib. Backport of trunk
r76382, r76383, and r76385.

Closes #16192.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2014-10-03 14:38:11 +00:00
parent 04a7f51ccd
commit 8a35babbbf
10 changed files with 304 additions and 51 deletions

View File

@@ -254,10 +254,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 407A752213B0E1EB006BC2D5 /* wxcocoa.xcconfig */;
buildSettings = {
OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)",
"-lz",
);
OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
PRODUCT_NAME = minimal_cocoa;
};
name = Debug;
@@ -266,10 +263,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 407A752213B0E1EB006BC2D5 /* wxcocoa.xcconfig */;
buildSettings = {
OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)",
"-lz",
);
OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
PRODUCT_NAME = minimal_cocoa;
};
name = Release;