From 52b633eeea3f66b1654a6d40b4180f70abc212e1 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Mon, 21 Apr 2014 18:31:48 +0000
Subject: [PATCH] adapting xcode build templates and config file to built-in
 zlib sources, see #16192

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 build/osx/wx.xcconfig                           |  2 +-
 build/osx/wxcarbon_in.xcodeproj/project.pbxproj | 10 ++--------
 build/osx/wxcocoa_in.xcodeproj/project.pbxproj  | 10 ++--------
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/build/osx/wx.xcconfig b/build/osx/wx.xcconfig
index 81bbcaf4c5..3a3822f70e 100644
--- a/build/osx/wx.xcconfig
+++ b/build/osx/wx.xcconfig
@@ -11,7 +11,7 @@ OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS) -fvisibility-inlines-hidden
 GCC_PREFIX_HEADER = $(WXROOT)/include/wx/wxprec.h
 GCC_PRECOMPILE_PREFIX_HEADER = YES
 HEADER_SEARCH_PATHS = "$(WXROOT)/src/tiff/libtiff"
-USER_HEADER_SEARCH_PATHS = "$(WXROOT)/include" "$(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include" "$(WXROOT)/src/jpeg" "$(WXROOT)/src/png" "$(WXROOT)/src/regex" "$(WXROOT)/src/expat/lib" "$(WXROOT)/src/tiff/libtiff" "$(WXROOT)/src/stc/scintilla/src" "$(WXROOT)/src/stc/scintilla/include" "$(WXROOT)/src/stc/scintilla/lexlib"
+USER_HEADER_SEARCH_PATHS = "$(WXROOT)/include" "$(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include" "$(WXROOT)/src/zlib" "$(WXROOT)/src/jpeg" "$(WXROOT)/src/png" "$(WXROOT)/src/regex" "$(WXROOT)/src/expat/lib" "$(WXROOT)/src/tiff/libtiff" "$(WXROOT)/src/stc/scintilla/src" "$(WXROOT)/src/stc/scintilla/include" "$(WXROOT)/src/stc/scintilla/lexlib"
 ALWAYS_SEARCH_USER_PATHS = NO
 GCC_PREPROCESSOR_DEFINITIONS = $(WX_PREPROCESSOR_DEFINITIONS) WXBUILDING $(WXPLATFORM) __WX__ wxUSE_BASE=1 _FILE_OFFSET_BITS=64 _LARGE_FILES MACOS_CLASSIC __WXMAC_XCODE__=1 SCI_LEXER WX_PRECOMP=1 wxUSE_UNICODE_UTF8=0 wxUSE_UNICODE_WCHAR=1
 GCC_PFE_FILE_C_DIALECTS = c++ objective-c++
diff --git a/build/osx/wxcarbon_in.xcodeproj/project.pbxproj b/build/osx/wxcarbon_in.xcodeproj/project.pbxproj
index 8a8811c93d..1cc9e57e10 100644
--- a/build/osx/wxcarbon_in.xcodeproj/project.pbxproj
+++ b/build/osx/wxcarbon_in.xcodeproj/project.pbxproj
@@ -187,10 +187,7 @@
 			buildSettings = {
 				EXECUTABLE_PREFIX = lib;
 				INSTALL_PATH = "@executable_path/../Frameworks/";
-				OTHER_LDFLAGS = (
-					"$(OTHER_LDFLAGS)",
-					"-lz",
-				);
+				OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
 			};
 			name = Debug;
 		};
@@ -200,10 +197,7 @@
 			buildSettings = {
 				EXECUTABLE_PREFIX = lib;
 				INSTALL_PATH = "@executable_path/../Frameworks/";
-				OTHER_LDFLAGS = (
-					"$(OTHER_LDFLAGS)",
-					"-lz",
-				);
+				OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
 			};
 			name = Release;
 		};
diff --git a/build/osx/wxcocoa_in.xcodeproj/project.pbxproj b/build/osx/wxcocoa_in.xcodeproj/project.pbxproj
index 79c5e0452d..14c2973d59 100644
--- a/build/osx/wxcocoa_in.xcodeproj/project.pbxproj
+++ b/build/osx/wxcocoa_in.xcodeproj/project.pbxproj
@@ -191,10 +191,7 @@
 					WXUSINGDLL,
 				);
 				INSTALL_PATH = "@executable_path/../Frameworks/";
-				OTHER_LDFLAGS = (
-					"$(OTHER_LDFLAGS)",
-					"-lz",
-				);
+				OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
 			};
 			name = Debug;
 		};
@@ -208,10 +205,7 @@
 					WXUSINGDLL,
 				);
 				INSTALL_PATH = "@executable_path/../Frameworks/";
-				OTHER_LDFLAGS = (
-					"$(OTHER_LDFLAGS)",
-					"-lz",
-				);
+				OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
 			};
 			name = Release;
 		};