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

build/osx/makeprojects.applescript

@@ -216,7 +216,7 @@ end makeProject
 
 init()
 set theProject to {projectName:"", conditions:{}, bklfiles:{<EFBFBD>
-	"../bakefiles/files.bkl", "../bakefiles/regex.bkl", "../bakefiles/tiff.bkl", "../bakefiles/png.bkl", "../bakefiles/jpeg.bkl", "../bakefiles/scintilla.bkl", "../bakefiles/expat.bkl"}, nodes:{<EFBFBD>
+	"../bakefiles/files.bkl", "../bakefiles/zlib.bkl", "../bakefiles/regex.bkl", "../bakefiles/tiff.bkl", "../bakefiles/png.bkl", "../bakefiles/jpeg.bkl", "../bakefiles/scintilla.bkl", "../bakefiles/expat.bkl"}, nodes:{<EFBFBD>
 	{label:"base", entries:{"$(BASE_SRC)"}}, <EFBFBD>
 	{label:"base", entries:{"$(BASE_AND_GUI_SRC)"}}, <EFBFBD>
 	{label:"core", entries:{"$(CORE_SRC)"}}, <EFBFBD>
@@ -233,6 +233,7 @@ set theProject to {projectName:"", conditions:{}, bklfiles:{
 	{label:"propgrid", entries:{"$(PROPGRID_SRC)"}}, <EFBFBD>
 	{label:"richtext", entries:{"$(RICHTEXT_SRC)"}}, <EFBFBD>
 	{label:"stc", entries:{"$(STC_SRC)"}}, <EFBFBD>
+	{label:"libzlib", entries:{"$(wxzlib)"}}, <EFBFBD>
 	{label:"libtiff", entries:{"$(wxtiff)"}}, <EFBFBD>
 	{label:"libjpeg", entries:{"$(wxjpeg)"}}, <EFBFBD>
 	{label:"libpng", entries:{"$(wxpng)"}}, <EFBFBD>

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++

build/osx/wxcarbon.xcodeproj/project.pbxproj

@@ -119,6 +119,8 @@
 		0E024D145DDD38ACAE68F463 /* toplevel_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E2C8A7034343354841F7D8B /* toplevel_osx.cpp */; };
 		0E60E17BA4B23347A4F20160 /* gdicmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998D611109EC33A9A6A11C5A /* gdicmn.cpp */; };
 		0E60E17BA4B23347A4F20161 /* gdicmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998D611109EC33A9A6A11C5A /* gdicmn.cpp */; };
+		0E8A0B8FA40E365690C20230 /* gzlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 7395814D42CC38F6B8CD81B4 /* gzlib.c */; };
+		0E8A0B8FA40E365690C20231 /* gzlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 7395814D42CC38F6B8CD81B4 /* gzlib.c */; };
 		0E92CEF677AA32C9A8CDA0A7 /* checkbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */; };
 		0E92CEF677AA32C9A8CDA0A8 /* checkbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */; };
 		0EB6AB38A68D3845AC384A23 /* xh_text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53B95C9A1BCB30CC87495DA3 /* xh_text.cpp */; };
@@ -133,6 +135,8 @@
 		0FDDE8E193743F3A8CBDC67D /* richtextprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C4C45D3C63AA37CEBCE83321 /* richtextprint.cpp */; };
 		0FFFFA2F762B3160955D1D88 /* gauge_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC28591B403B32B7AFCC079D /* gauge_osx.cpp */; };
 		0FFFFA2F762B3160955D1D89 /* gauge_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC28591B403B32B7AFCC079D /* gauge_osx.cpp */; };
+		10743B74A58231639C6BF610 /* inffast.c in Sources */ = {isa = PBXBuildFile; fileRef = 400275BE019D3E5BA47988BE /* inffast.c */; };
+		10743B74A58231639C6BF611 /* inffast.c in Sources */ = {isa = PBXBuildFile; fileRef = 400275BE019D3E5BA47988BE /* inffast.c */; };
 		11818B68C5263EB68D708845 /* jdtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 4549845C0751356A907C23E0 /* jdtrans.c */; };
 		11818B68C5263EB68D708846 /* jdtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 4549845C0751356A907C23E0 /* jdtrans.c */; };
 		11DD420E32FB3EFB9DA0AB5B /* jccolor.c in Sources */ = {isa = PBXBuildFile; fileRef = 8EFF4707641D3F20AB602ED6 /* jccolor.c */; };
@@ -209,6 +213,8 @@
 		1C544DADDA6F3D62A5E25E94 /* LexerSimple.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CF502E0E4D853CBBBEC885EF /* LexerSimple.cxx */; };
 		1CBF34ACA39330028A5EA9AC /* xmlreshandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AD367F1047838A9A7A34DBF /* xmlreshandler.cpp */; };
 		1CBF34ACA39330028A5EA9AD /* xmlreshandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AD367F1047838A9A7A34DBF /* xmlreshandler.cpp */; };
+		1CC5AEC6C08E3600801CDADA /* trees.c in Sources */ = {isa = PBXBuildFile; fileRef = 95B4EDF38F8A3E5EBAFF560F /* trees.c */; };
+		1CC5AEC6C08E3600801CDADB /* trees.c in Sources */ = {isa = PBXBuildFile; fileRef = 95B4EDF38F8A3E5EBAFF560F /* trees.c */; };
 		1CD4F67F48CF3A5FA477D86E /* datavcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */; };
 		1CD4F67F48CF3A5FA477D86F /* datavcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */; };
 		1D726139C977341A97D0C931 /* datetimefmt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 864438709B363773B8C3382D /* datetimefmt.cpp */; };
@@ -245,6 +251,8 @@
 		20F10669703137E68318C6FE /* cmndata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0510EE0FB3FF36EF8670ABD1 /* cmndata.cpp */; };
 		2102C23970FB3F22AB46A59A /* LexTADS3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A284E855892F3A9E9E19E854 /* LexTADS3.cxx */; };
 		2102C23970FB3F22AB46A59B /* LexTADS3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A284E855892F3A9E9E19E854 /* LexTADS3.cxx */; };
+		213CE0DD5B2335D0AD53B54A /* gzclose.c in Sources */ = {isa = PBXBuildFile; fileRef = 7A24E9101688368296C21EBE /* gzclose.c */; };
+		213CE0DD5B2335D0AD53B54B /* gzclose.c in Sources */ = {isa = PBXBuildFile; fileRef = 7A24E9101688368296C21EBE /* gzclose.c */; };
 		221DC4F6678A3EC5ACDDEA4F /* statbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F16A18CD9C23410B18592FD /* statbox_osx.cpp */; };
 		221DC4F6678A3EC5ACDDEA50 /* statbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F16A18CD9C23410B18592FD /* statbox_osx.cpp */; };
 		22AE900003F73134BBEE8BB6 /* dirctrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91292D8E11203A6B8E9767DA /* dirctrlg.cpp */; };
@@ -407,6 +415,8 @@
 		37749AC3468836FC857BD0D6 /* checklstcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83A94241BCB13767AFEC5946 /* checklstcmn.cpp */; };
 		37DD17F479A1371ABF3589B9 /* xh_wizrd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */; };
 		37DD17F479A1371ABF3589BA /* xh_wizrd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */; };
+		3813146434693234965C4F31 /* inftrees.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D6B0D32537D35069C7E053F /* inftrees.c */; };
+		3813146434693234965C4F32 /* inftrees.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D6B0D32537D35069C7E053F /* inftrees.c */; };
 		383A6993E90936D39A5F12BD /* headerctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */; };
 		383A6993E90936D39A5F12BE /* headerctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */; };
 		3902517F9ED03648B5A4B96A /* drawer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39B825E5EAB43D9ABDCEB2CD /* drawer.cpp */; };
@@ -457,12 +467,16 @@
 		4040AE89BF9F34668091064B /* dragimgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A67053D16D63C588E555C84 /* dragimgg.cpp */; };
 		41943A8F82723027A151A468 /* fileconf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61DA2A4C0D143CBE804BB8A1 /* fileconf.cpp */; };
 		41943A8F82723027A151A469 /* fileconf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61DA2A4C0D143CBE804BB8A1 /* fileconf.cpp */; };
+		42260A6F1853361083803B0C /* zutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CB467F9898C3952A68D988B /* zutil.c */; };
+		42260A6F1853361083803B0D /* zutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CB467F9898C3952A68D988B /* zutil.c */; };
 		4269B85FDC5639BEB76A8AEB /* nonownedwnd_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */; };
 		4269B85FDC5639BEB76A8AEC /* nonownedwnd_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */; };
 		4279D39CAAF834F6A5B99196 /* persist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22D9626646773CED82449D5D /* persist.cpp */; };
 		4279D39CAAF834F6A5B99197 /* persist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22D9626646773CED82449D5D /* persist.cpp */; };
 		427E6AF88CF73D799206E37D /* checkboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FC2F076657431458896115A /* checkboxcmn.cpp */; };
 		427E6AF88CF73D799206E37E /* checkboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FC2F076657431458896115A /* checkboxcmn.cpp */; };
+		42AC484FDD7D3E948CEA801C /* inflate.c in Sources */ = {isa = PBXBuildFile; fileRef = B5370A676AAC32419D7FDD87 /* inflate.c */; };
+		42AC484FDD7D3E948CEA801D /* inflate.c in Sources */ = {isa = PBXBuildFile; fileRef = B5370A676AAC32419D7FDD87 /* inflate.c */; };
 		42ED9BAFD6E936849F1D36CB /* xtixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4048A3523EC03409BD899BEF /* xtixml.cpp */; };
 		42ED9BAFD6E936849F1D36CC /* xtixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4048A3523EC03409BD899BEF /* xtixml.cpp */; };
 		437519A6002A3A0FB2C9A8FC /* settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E6CC2B05353C3284B37B2DD7 /* settings.cpp */; };
@@ -515,6 +529,8 @@
 		4AEC67BF65B039D99F421667 /* statbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C87B071E3593A889704F512 /* statbar.cpp */; };
 		4B88254FF9963833A276A64C /* snglinst.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */; };
 		4B88254FF9963833A276A64D /* snglinst.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */; };
+		4B996B4C54163D7091427DB5 /* gzread.c in Sources */ = {isa = PBXBuildFile; fileRef = BAD4614CABC934D6AFF8D9CD /* gzread.c */; };
+		4B996B4C54163D7091427DB6 /* gzread.c in Sources */ = {isa = PBXBuildFile; fileRef = BAD4614CABC934D6AFF8D9CD /* gzread.c */; };
 		4BAFAE70A6B1313B96D86630 /* page.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59ED0C057D8F388A89DC7177 /* page.cpp */; };
 		4BAFAE70A6B1313B96D86631 /* page.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59ED0C057D8F388A89DC7177 /* page.cpp */; };
 		4C9BA36123E43589956864C6 /* Style.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C28429A964C337A192D76CC8 /* Style.cxx */; };
@@ -533,6 +549,8 @@
 		4DD98A9436C83CF3B9425A79 /* sysopt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F32F6B47EBB23068B1FCDC0D /* sysopt.cpp */; };
 		4E140367282F38C8A904A004 /* utilsexc_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81390F96937631078EFCD891 /* utilsexc_base.cpp */; };
 		4E140367282F38C8A904A005 /* utilsexc_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81390F96937631078EFCD891 /* utilsexc_base.cpp */; };
+		4E2737AC738431EB9898B8B6 /* gzwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E4E3EB1CCA53E0EA322A1AF /* gzwrite.c */; };
+		4E2737AC738431EB9898B8B7 /* gzwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E4E3EB1CCA53E0EA322A1AF /* gzwrite.c */; };
 		4E396D8D2E9138D797F320C6 /* tif_aux.c in Sources */ = {isa = PBXBuildFile; fileRef = D0CDADAF2D893E32A38351E4 /* tif_aux.c */; };
 		4E396D8D2E9138D797F320C7 /* tif_aux.c in Sources */ = {isa = PBXBuildFile; fileRef = D0CDADAF2D893E32A38351E4 /* tif_aux.c */; };
 		50D7E093424138C88BB50D27 /* jcsample.c in Sources */ = {isa = PBXBuildFile; fileRef = 53D06E47477B3E32BB6B915E /* jcsample.c */; };
@@ -603,6 +621,8 @@
 		5C44446AB150378696CD6B3D /* bmpcboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CF560E06F2A3B6088203D09 /* bmpcboxcmn.cpp */; };
 		5C5D0983160A36189A770742 /* webviewarchivehandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */; };
 		5C5D0983160A36189A770743 /* webviewarchivehandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */; };
+		5EE94793DFCB3BA281A4864E /* infback.c in Sources */ = {isa = PBXBuildFile; fileRef = FDB0E2D0966C3E408C4A2D3D /* infback.c */; };
+		5EE94793DFCB3BA281A4864F /* infback.c in Sources */ = {isa = PBXBuildFile; fileRef = FDB0E2D0966C3E408C4A2D3D /* infback.c */; };
 		5F2C2A46781739D897CF293D /* xh_chckl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */; };
 		5F2C2A46781739D897CF293E /* xh_chckl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */; };
 		5F57C4908E5038D19D68ED7A /* gallery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F1C1EB5C0B3302C86D91315 /* gallery.cpp */; };
@@ -899,6 +919,8 @@
 		8B60964DA1DF3F3DB40BE124 /* datavgen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F3D473DC5123EDAB767045C /* datavgen.cpp */; };
 		8B9C9FCB954F3596A4CED9A5 /* jdapimin.c in Sources */ = {isa = PBXBuildFile; fileRef = 86884BC843F6337EABF744BB /* jdapimin.c */; };
 		8B9C9FCB954F3596A4CED9A6 /* jdapimin.c in Sources */ = {isa = PBXBuildFile; fileRef = 86884BC843F6337EABF744BB /* jdapimin.c */; };
+		8DE45CEAF2DD3C22AA019F74 /* deflate.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CF73F49AEC238C99CE89845 /* deflate.c */; };
+		8DE45CEAF2DD3C22AA019F75 /* deflate.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CF73F49AEC238C99CE89845 /* deflate.c */; };
 		8E220BCD39B336A495E775BD /* aboutdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BBF01162E86737818F704DBE /* aboutdlg.cpp */; };
 		8E220BCD39B336A495E775BE /* aboutdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BBF01162E86737818F704DBE /* aboutdlg.cpp */; };
 		8E674574343A3C009B1BCD00 /* tif_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 88FF67EB6E7D302A9CDEF660 /* tif_codec.c */; };
@@ -1003,6 +1025,8 @@
 		9B8E5690A6103FC1BDC6C47F /* pngread.c in Sources */ = {isa = PBXBuildFile; fileRef = 29D6506AEA5A323B8735F126 /* pngread.c */; };
 		9C1F073349FD393E9220C0D3 /* combog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CBD7B44E33373BCCB60FC11F /* combog.cpp */; };
 		9C1F073349FD393E9220C0D4 /* combog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CBD7B44E33373BCCB60FC11F /* combog.cpp */; };
+		9C6E9E4BA54733EF9F87E4B7 /* uncompr.c in Sources */ = {isa = PBXBuildFile; fileRef = 513033E36E643593AC305B3D /* uncompr.c */; };
+		9C6E9E4BA54733EF9F87E4B8 /* uncompr.c in Sources */ = {isa = PBXBuildFile; fileRef = 513033E36E643593AC305B3D /* uncompr.c */; };
 		9CA687845B3F30CCA44A89D0 /* choicbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 09F8B0818C3A3248A26EE05D /* choicbkg.cpp */; };
 		9CA687845B3F30CCA44A89D1 /* choicbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 09F8B0818C3A3248A26EE05D /* choicbkg.cpp */; };
 		9CC92BB4B0E233A0A7F81279 /* LexVisualProlog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 43D416CF0DE334E79A8E48C8 /* LexVisualProlog.cxx */; };
@@ -1097,6 +1121,8 @@
 		AB58406CEBA13BC4A2A83B67 /* printmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CC5C13F8AA1387BADB7E60C /* printmac.cpp */; };
 		ABCD15C4AB37396EA17B7B28 /* translation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6AC666417602346EA583709E /* translation.cpp */; };
 		ABCD15C4AB37396EA17B7B29 /* translation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6AC666417602346EA583709E /* translation.cpp */; };
+		AC07BA4EA5403443914DFDB1 /* crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = 7013DB195D023C31ADE68546 /* crc32.c */; };
+		AC07BA4EA5403443914DFDB2 /* crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = 7013DB195D023C31ADE68546 /* crc32.c */; };
 		AC0B0C52922B30188AE95E94 /* tabart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51054B41BFD83E97BAF76D07 /* tabart.cpp */; };
 		AC0B0C52922B30188AE95E95 /* tabart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51054B41BFD83E97BAF76D07 /* tabart.cpp */; };
 		AC6AC589EFB233C7B65A3224 /* overlaycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 303ACF199BE431BD891C9301 /* overlaycmn.cpp */; };
@@ -1203,6 +1229,8 @@
 		BDB7B2AD26CB356B8BEAAECE /* jchuff.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0FFDC7A6163F2DA73B84EB /* jchuff.c */; };
 		BDB8EF0E0DA03693BFB77EF7 /* accesscmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8555204EBA8930809B732842 /* accesscmn.cpp */; };
 		BDB8EF0E0DA03693BFB77EF8 /* accesscmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8555204EBA8930809B732842 /* accesscmn.cpp */; };
+		BE3ED6EF34303867B8C8E923 /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = D4C4495603293C07A3B09D54 /* compress.c */; };
+		BE3ED6EF34303867B8C8E924 /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = D4C4495603293C07A3B09D54 /* compress.c */; };
 		BE99A85EE76236CC8C719A64 /* xh_gauge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */; };
 		BE99A85EE76236CC8C719A65 /* xh_gauge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */; };
 		BEA90F2C6BB93143958F899A /* propgridiface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69E742B172463EDFBBFA5AB0 /* propgridiface.cpp */; };
@@ -1597,6 +1625,8 @@
 		F569D7A3F0E038E9B4CC2A77 /* xh_comboctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5FC445EFDC503C74A5CC6D7D /* xh_comboctrl.cpp */; };
 		F5806029B1BA3924A8FDDBC1 /* busyinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F94CF171F4532B89FECF475 /* busyinfo.cpp */; };
 		F5806029B1BA3924A8FDDBC2 /* busyinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F94CF171F4532B89FECF475 /* busyinfo.cpp */; };
+		F5B0B26BD0803719A3FCB4D7 /* adler32.c in Sources */ = {isa = PBXBuildFile; fileRef = 0E45F6DF601A34BCB3CC0206 /* adler32.c */; };
+		F5B0B26BD0803719A3FCB4D8 /* adler32.c in Sources */ = {isa = PBXBuildFile; fileRef = 0E45F6DF601A34BCB3CC0206 /* adler32.c */; };
 		F5D0BCF1A6C839E5829199E2 /* sizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */; };
 		F5D0BCF1A6C839E5829199E3 /* sizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */; };
 		F5D2146C94E733FAAB6D286A /* threadpsx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB466912FDA23F8B87A00A3C /* threadpsx.cpp */; };
@@ -1712,6 +1742,7 @@
 		0D3BD03BCE953D1B964EDB7A /* colourdata.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colourdata.cpp; path = ../../src/common/colourdata.cpp; sourceTree = "<group>"; };
 		0D9828C9BD9633C1A8F4E0CD /* LexRebol.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexRebol.cxx; path = ../../src/stc/scintilla/lexers/LexRebol.cxx; sourceTree = "<group>"; };
 		0DA80913C0E33144A42BD30F /* webview.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = webview.cpp; path = ../../src/common/webview.cpp; sourceTree = "<group>"; };
+		0E45F6DF601A34BCB3CC0206 /* adler32.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = adler32.c; path = ../../src/zlib/adler32.c; sourceTree = "<group>"; };
 		0E7BF9256DF533EBAE2B945E /* WordList.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = WordList.cxx; path = ../../src/stc/scintilla/lexlib/WordList.cxx; sourceTree = "<group>"; };
 		0EB91E8407CB3300A19F387D /* ctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ctrlcmn.cpp; path = ../../src/common/ctrlcmn.cpp; sourceTree = "<group>"; };
 		0EEAD9C3E180305D8899441E /* strvararg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = strvararg.cpp; path = ../../src/common/strvararg.cpp; sourceTree = "<group>"; };
@@ -1763,6 +1794,7 @@
 		1CE9B3DD54AD318FAA821732 /* richtextimagedlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextimagedlg.cpp; path = ../../src/richtext/richtextimagedlg.cpp; sourceTree = "<group>"; };
 		1DAF0931E4AD3E6581D7FDBC /* jidctint.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctint.c; path = ../../src/jpeg/jidctint.c; sourceTree = "<group>"; };
 		1E2FEBCEED2D33CFAAF75206 /* gbsizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gbsizer.cpp; path = ../../src/common/gbsizer.cpp; sourceTree = "<group>"; };
+		1E4E3EB1CCA53E0EA322A1AF /* gzwrite.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzwrite.c; path = ../../src/zlib/gzwrite.c; sourceTree = "<group>"; };
 		1EF103B09F02315282EC8F44 /* srchcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = srchcmn.cpp; path = ../../src/common/srchcmn.cpp; sourceTree = "<group>"; };
 		1EF327CE8D7E3C11BFC6BD74 /* jdapistd.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdapistd.c; path = ../../src/jpeg/jdapistd.c; sourceTree = "<group>"; };
 		1F6E23CCDC1932BC985EFBD2 /* sckipc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sckipc.cpp; path = ../../src/common/sckipc.cpp; sourceTree = "<group>"; };
@@ -1854,6 +1886,7 @@
 		3BFC1F090EFE30B784CE4C64 /* xh_toolb.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_toolb.cpp; path = ../../src/xrc/xh_toolb.cpp; sourceTree = "<group>"; };
 		3C131F7BF8A83960ACB26242 /* jidctflt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctflt.c; path = ../../src/jpeg/jidctflt.c; sourceTree = "<group>"; };
 		3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sizer.cpp; path = ../../src/common/sizer.cpp; sourceTree = "<group>"; };
+		3CF73F49AEC238C99CE89845 /* deflate.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = deflate.c; path = ../../src/zlib/deflate.c; sourceTree = "<group>"; };
 		3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = snglinst.cpp; path = ../../src/unix/snglinst.cpp; sourceTree = "<group>"; };
 		3D82E7D38BB43BB886E2BFA0 /* tif_getimage.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_getimage.c; path = ../../src/tiff/libtiff/tif_getimage.c; sourceTree = "<group>"; };
 		3DFD4F32E48039C3B9A66355 /* textcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textcmn.cpp; path = ../../src/common/textcmn.cpp; sourceTree = "<group>"; };
@@ -1864,6 +1897,7 @@
 		3F8836E29C5A370E80CE070E /* splash.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = splash.cpp; path = ../../src/generic/splash.cpp; sourceTree = "<group>"; };
 		3FB6D34C3029357EB64AECAA /* scrlwing.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = scrlwing.cpp; path = ../../src/generic/scrlwing.cpp; sourceTree = "<group>"; };
 		3FEBA7AC7F743EE88352AEBC /* htmlwin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmlwin.cpp; path = ../../src/html/htmlwin.cpp; sourceTree = "<group>"; };
+		400275BE019D3E5BA47988BE /* inffast.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = inffast.c; path = ../../src/zlib/inffast.c; sourceTree = "<group>"; };
 		4048A3523EC03409BD899BEF /* xtixml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xtixml.cpp; path = ../../src/common/xtixml.cpp; sourceTree = "<group>"; };
 		40586C8986443431A64EB066 /* LexLisp.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLisp.cxx; path = ../../src/stc/scintilla/lexers/LexLisp.cxx; sourceTree = "<group>"; };
 		4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_pixarlog.c; path = ../../src/tiff/libtiff/tif_pixarlog.c; sourceTree = "<group>"; };
@@ -1902,6 +1936,7 @@
 		4BA14FFC0F4B3AE0B4D6B185 /* jquant1.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jquant1.c; path = ../../src/jpeg/jquant1.c; sourceTree = "<group>"; };
 		4BA819575B5136B09FA8FEB1 /* pen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pen.cpp; path = ../../src/osx/pen.cpp; sourceTree = "<group>"; };
 		4C4649974D8B3A109D1BF145 /* art_internal.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = art_internal.cpp; path = ../../src/ribbon/art_internal.cpp; sourceTree = "<group>"; };
+		4CB467F9898C3952A68D988B /* zutil.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = zutil.c; path = ../../src/zlib/zutil.c; sourceTree = "<group>"; };
 		4EB3B255D20F3AE5A95230F6 /* LexCSS.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCSS.cxx; path = ../../src/stc/scintilla/lexers/LexCSS.cxx; sourceTree = "<group>"; };
 		4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CallTip.cxx; path = ../../src/stc/scintilla/src/CallTip.cxx; sourceTree = "<group>"; };
 		4F768B23D8B535CE8D0BD343 /* tif_jpeg_12.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_jpeg_12.c; path = ../../src/tiff/libtiff/tif_jpeg_12.c; sourceTree = "<group>"; };
@@ -1911,6 +1946,7 @@
 		4FE0B33481283D3493613B0F /* config.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = config.cpp; path = ../../src/common/config.cpp; sourceTree = "<group>"; };
 		508B04B4FF913BECBC9DBFFB /* LexSpecman.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSpecman.cxx; path = ../../src/stc/scintilla/lexers/LexSpecman.cxx; sourceTree = "<group>"; };
 		51054B41BFD83E97BAF76D07 /* tabart.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tabart.cpp; path = ../../src/aui/tabart.cpp; sourceTree = "<group>"; };
+		513033E36E643593AC305B3D /* uncompr.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = uncompr.c; path = ../../src/zlib/uncompr.c; sourceTree = "<group>"; };
 		5145561C78303EEE9F827962 /* LexLua.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLua.cxx; path = ../../src/stc/scintilla/lexers/LexLua.cxx; sourceTree = "<group>"; };
 		5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cfstring.cpp; path = ../../src/osx/core/cfstring.cpp; sourceTree = "<group>"; };
 		5190E3E110443FD29F2474FC /* treelist.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treelist.cpp; path = ../../src/generic/treelist.cpp; sourceTree = "<group>"; };
@@ -2024,6 +2060,7 @@
 		6EDDEEEC981133E8BA6A3998 /* jcapimin.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcapimin.c; path = ../../src/jpeg/jcapimin.c; sourceTree = "<group>"; };
 		6F23140777B733679D2FAAFC /* odcombocmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = odcombocmn.cpp; path = ../../src/common/odcombocmn.cpp; sourceTree = "<group>"; };
 		70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = webviewarchivehandler.cpp; path = ../../src/common/webviewarchivehandler.cpp; sourceTree = "<group>"; };
+		7013DB195D023C31ADE68546 /* crc32.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = crc32.c; path = ../../src/zlib/crc32.c; sourceTree = "<group>"; };
 		701B84EE7C043B539FF5195A /* textbuf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textbuf.cpp; path = ../../src/common/textbuf.cpp; sourceTree = "<group>"; };
 		7020ADB5D3E0375E875B418B /* LexA68k.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexA68k.cxx; path = ../../src/stc/scintilla/lexers/LexA68k.cxx; sourceTree = "<group>"; };
 		70E9B2C076673C87B4218A01 /* panelcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = panelcmn.cpp; path = ../../src/common/panelcmn.cpp; sourceTree = "<group>"; };
@@ -2038,6 +2075,7 @@
 		727F25F832AD32D4B12D8E39 /* m_span.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_span.cpp; path = ../../src/html/m_span.cpp; sourceTree = "<group>"; };
 		72869747E68E37998CB0A07E /* jdhuff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdhuff.c; path = ../../src/jpeg/jdhuff.c; sourceTree = "<group>"; };
 		72D7AF345E563587941BD868 /* longlong.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = longlong.cpp; path = ../../src/common/longlong.cpp; sourceTree = "<group>"; };
+		7395814D42CC38F6B8CD81B4 /* gzlib.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzlib.c; path = ../../src/zlib/gzlib.c; sourceTree = "<group>"; };
 		741578B590AF3F2CABE615EB /* timectrlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timectrlg.cpp; path = ../../src/generic/timectrlg.cpp; sourceTree = "<group>"; };
 		75278C04709D3482A2660DFC /* slider.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = slider.cpp; path = ../../src/osx/carbon/slider.cpp; sourceTree = "<group>"; };
 		757B31FCCA1F381C95B30DF8 /* app.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = app.cpp; path = ../../src/osx/carbon/app.cpp; sourceTree = "<group>"; };
@@ -2055,6 +2093,7 @@
 		7925E38823563BCDB5565DCF /* treebkg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treebkg.cpp; path = ../../src/generic/treebkg.cpp; sourceTree = "<group>"; };
 		7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtexthtml.cpp; path = ../../src/richtext/richtexthtml.cpp; sourceTree = "<group>"; };
 		7A1CE0B28CB73F90AE92B5AB /* richtooltipcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtooltipcmn.cpp; path = ../../src/common/richtooltipcmn.cpp; sourceTree = "<group>"; };
+		7A24E9101688368296C21EBE /* gzclose.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzclose.c; path = ../../src/zlib/gzclose.c; sourceTree = "<group>"; };
 		7A34C5BBBA543DC0A50DE1B6 /* event.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = event.cpp; path = ../../src/common/event.cpp; sourceTree = "<group>"; };
 		7A3F26F539473705AA82411D /* combobox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = combobox.cpp; path = ../../src/osx/carbon/combobox.cpp; sourceTree = "<group>"; };
 		7AF8F8A78A5130DCB4D46729 /* LexCmake.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCmake.cxx; path = ../../src/stc/scintilla/lexers/LexCmake.cxx; sourceTree = "<group>"; };
@@ -2141,6 +2180,7 @@
 		950D51915EF83B57B5E8306F /* xh_spin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_spin.cpp; path = ../../src/xrc/xh_spin.cpp; sourceTree = "<group>"; };
 		95A156A823B536DE8476E4F9 /* appbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = appbase.cpp; path = ../../src/common/appbase.cpp; sourceTree = "<group>"; };
 		95B1DB08E37B3EB193FEFE0C /* nonownedwnd.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = nonownedwnd.cpp; path = ../../src/osx/carbon/nonownedwnd.cpp; sourceTree = "<group>"; };
+		95B4EDF38F8A3E5EBAFF560F /* trees.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = trees.c; path = ../../src/zlib/trees.c; sourceTree = "<group>"; };
 		95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datavcmn.cpp; path = ../../src/common/datavcmn.cpp; sourceTree = "<group>"; };
 		95E2B80B2D7033808504DA8D /* utilsexc_cf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = utilsexc_cf.cpp; path = ../../src/osx/core/utilsexc_cf.cpp; sourceTree = "<group>"; };
 		9660AE8FEB7B3EDB857B9238 /* lboxcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = lboxcmn.cpp; path = ../../src/common/lboxcmn.cpp; sourceTree = "<group>"; };
@@ -2167,6 +2207,7 @@
 		9CC7C6FFD67233788EEDFC5E /* LexYAML.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexYAML.cxx; path = ../../src/stc/scintilla/lexers/LexYAML.cxx; sourceTree = "<group>"; };
 		9CE73979D0933A43830307E4 /* tif_packbits.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_packbits.c; path = ../../src/tiff/libtiff/tif_packbits.c; sourceTree = "<group>"; };
 		9D1F14339D1C331087650931 /* colour.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colour.cpp; path = ../../src/osx/core/colour.cpp; sourceTree = "<group>"; };
+		9D6B0D32537D35069C7E053F /* inftrees.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = inftrees.c; path = ../../src/zlib/inftrees.c; sourceTree = "<group>"; };
 		9DB43FAB1E563B02ACEFF647 /* module.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = module.cpp; path = ../../src/common/module.cpp; sourceTree = "<group>"; };
 		9DD609EC0591359C9A576A43 /* printdlg_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = printdlg_osx.cpp; path = ../../src/osx/printdlg_osx.cpp; sourceTree = "<group>"; };
 		9DE6A96FDD5D381D8B33D58E /* infobar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = infobar.cpp; path = ../../src/generic/infobar.cpp; sourceTree = "<group>"; };
@@ -2258,6 +2299,7 @@
 		B44B32437825326C84607AD8 /* wxcarbon.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxcarbon.xcconfig; sourceTree = "<group>"; };
 		B4DCCF66D880330A9EE9B6B2 /* xh_listb.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_listb.cpp; path = ../../src/xrc/xh_listb.cpp; sourceTree = "<group>"; };
 		B4E4032CA9883CA4B25BE082 /* xh_hyperlink.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_hyperlink.cpp; path = ../../src/xrc/xh_hyperlink.cpp; sourceTree = "<group>"; };
+		B5370A676AAC32419D7FDD87 /* inflate.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = inflate.c; path = ../../src/zlib/inflate.c; sourceTree = "<group>"; };
 		B540E18F9C91381CA175BABB /* art_msw.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = art_msw.cpp; path = ../../src/ribbon/art_msw.cpp; sourceTree = "<group>"; };
 		B558F1ED9346332D8C4BDFBC /* headercolcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = headercolcmn.cpp; path = ../../src/common/headercolcmn.cpp; sourceTree = "<group>"; };
 		B568A7364ECA30288820CCE7 /* mdi.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mdi.cpp; path = ../../src/osx/carbon/mdi.cpp; sourceTree = "<group>"; };
@@ -2281,6 +2323,7 @@
 		B9FD5AE12CA9376883AEE4FC /* tif_dirwrite.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dirwrite.c; path = ../../src/tiff/libtiff/tif_dirwrite.c; sourceTree = "<group>"; };
 		BACAA6CE4A0934459F26B27C /* graphicc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = graphicc.cpp; path = ../../src/generic/graphicc.cpp; sourceTree = "<group>"; };
 		BACF6FE87AD337729BBB72BD /* taskbar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = taskbar.cpp; path = ../../src/osx/carbon/taskbar.cpp; sourceTree = "<group>"; };
+		BAD4614CABC934D6AFF8D9CD /* gzread.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzread.c; path = ../../src/zlib/gzread.c; sourceTree = "<group>"; };
 		BAD9A0BFED6A37E4A305E1D7 /* filename.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filename.cpp; path = ../../src/common/filename.cpp; sourceTree = "<group>"; };
 		BB3FF9FECCB5300A9561CE36 /* richtextsymboldlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextsymboldlg.cpp; path = ../../src/richtext/richtextsymboldlg.cpp; sourceTree = "<group>"; };
 		BB7661E9E09A397790ED9545 /* sockunix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sockunix.cpp; path = ../../src/unix/sockunix.cpp; sourceTree = "<group>"; };
@@ -2374,6 +2417,7 @@
 		D41D102919B232EBB72A6F2D /* LexTxt2tags.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexTxt2tags.cxx; path = ../../src/stc/scintilla/lexers/LexTxt2tags.cxx; sourceTree = "<group>"; };
 		D46A36564C78312CAC538E93 /* srchctlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = srchctlg.cpp; path = ../../src/generic/srchctlg.cpp; sourceTree = "<group>"; };
 		D4A23A8BC7373D4BBD72851D /* apptraits.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = apptraits.cpp; path = ../../src/unix/apptraits.cpp; sourceTree = "<group>"; };
+		D4C4495603293C07A3B09D54 /* compress.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = compress.c; path = ../../src/zlib/compress.c; sourceTree = "<group>"; };
 		D4E1DC1869C6327C80D2F5F4 /* uri.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uri.cpp; path = ../../src/common/uri.cpp; sourceTree = "<group>"; };
 		D4FC6F0AB2AC34D2B26F8ED8 /* markuptext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = markuptext.cpp; path = ../../src/generic/markuptext.cpp; sourceTree = "<group>"; };
 		D5B7B7C10A3E3C689AE1E418 /* wxrelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxrelease.xcconfig; sourceTree = "<group>"; };
@@ -2505,6 +2549,7 @@
 		FD5F11A3646F397BA62EB037 /* htmllbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmllbox.cpp; path = ../../src/generic/htmllbox.cpp; sourceTree = "<group>"; };
 		FD6D2664C05131C3A06E98B4 /* ExternalLexer.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ExternalLexer.cxx; path = ../../src/stc/scintilla/src/ExternalLexer.cxx; sourceTree = "<group>"; };
 		FDAEFCE0ED9D30DA94340A3B /* xtistrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xtistrm.cpp; path = ../../src/common/xtistrm.cpp; sourceTree = "<group>"; };
+		FDB0E2D0966C3E408C4A2D3D /* infback.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = infback.c; path = ../../src/zlib/infback.c; sourceTree = "<group>"; };
 		FDD3CE34439B3D2BBD9DC8D3 /* gridcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gridcmn.cpp; path = ../../src/common/gridcmn.cpp; sourceTree = "<group>"; };
 		FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextctrl.cpp; path = ../../src/richtext/richtextctrl.cpp; sourceTree = "<group>"; };
 		FE3B47058A723243A285594D /* LexMPT.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMPT.cxx; path = ../../src/stc/scintilla/lexers/LexMPT.cxx; sourceTree = "<group>"; };
@@ -2666,6 +2711,7 @@
 				B8F95052522B37AB86DA8917 /* propgrid */,
 				64B126D857113F24BA8C4758 /* richtext */,
 				E96566B813153B4295AD767B /* stc */,
+				52DDFBAA5ACC394FB6B30E74 /* libzlib */,
 				EB288BE7E74B3328B762A461 /* libtiff */,
 				7650A73F7FC9305EA62DAE86 /* libjpeg */,
 				6E2C8858F68E3FB0BEFFFCE5 /* libpng */,
@@ -2898,6 +2944,14 @@
 			name = src/richtext;
 			sourceTree = "<group>";
 		};
+		52DDFBAA5ACC394FB6B30E74 /* libzlib */ = {
+			isa = PBXGroup;
+			children = (
+				A7471B15D7093D38B8649962 /* src/zlib */,
+			);
+			name = libzlib;
+			sourceTree = "<group>";
+		};
 		5C5CD199E7573C73AE6F392D /* media */ = {
 			isa = PBXGroup;
 			children = (
@@ -3288,6 +3342,28 @@
 			name = src/tiff/libtiff;
 			sourceTree = "<group>";
 		};
+		A7471B15D7093D38B8649962 /* src/zlib */ = {
+			isa = PBXGroup;
+			children = (
+				0E45F6DF601A34BCB3CC0206 /* adler32.c */,
+				D4C4495603293C07A3B09D54 /* compress.c */,
+				7013DB195D023C31ADE68546 /* crc32.c */,
+				3CF73F49AEC238C99CE89845 /* deflate.c */,
+				7A24E9101688368296C21EBE /* gzclose.c */,
+				7395814D42CC38F6B8CD81B4 /* gzlib.c */,
+				BAD4614CABC934D6AFF8D9CD /* gzread.c */,
+				1E4E3EB1CCA53E0EA322A1AF /* gzwrite.c */,
+				FDB0E2D0966C3E408C4A2D3D /* infback.c */,
+				400275BE019D3E5BA47988BE /* inffast.c */,
+				B5370A676AAC32419D7FDD87 /* inflate.c */,
+				9D6B0D32537D35069C7E053F /* inftrees.c */,
+				95B4EDF38F8A3E5EBAFF560F /* trees.c */,
+				513033E36E643593AC305B3D /* uncompr.c */,
+				4CB467F9898C3952A68D988B /* zutil.c */,
+			);
+			name = src/zlib;
+			sourceTree = "<group>";
+		};
 		AC04244D4E183DF480908046 /* src/osx/core */ = {
 			isa = PBXGroup;
 			children = (
@@ -4665,6 +4741,21 @@
 				E3B3E4F75D503DB89B5C622E /* stc.cpp in Sources */,
 				908957F65B7E36F8BF3858DE /* PlatWX.cpp in Sources */,
 				3E6AA08E72A030D39D867D4C /* ScintillaWX.cpp in Sources */,
+				F5B0B26BD0803719A3FCB4D8 /* adler32.c in Sources */,
+				BE3ED6EF34303867B8C8E924 /* compress.c in Sources */,
+				AC07BA4EA5403443914DFDB2 /* crc32.c in Sources */,
+				8DE45CEAF2DD3C22AA019F75 /* deflate.c in Sources */,
+				213CE0DD5B2335D0AD53B54B /* gzclose.c in Sources */,
+				0E8A0B8FA40E365690C20231 /* gzlib.c in Sources */,
+				4B996B4C54163D7091427DB6 /* gzread.c in Sources */,
+				4E2737AC738431EB9898B8B7 /* gzwrite.c in Sources */,
+				5EE94793DFCB3BA281A4864F /* infback.c in Sources */,
+				10743B74A58231639C6BF611 /* inffast.c in Sources */,
+				42AC484FDD7D3E948CEA801D /* inflate.c in Sources */,
+				3813146434693234965C4F32 /* inftrees.c in Sources */,
+				1CC5AEC6C08E3600801CDADB /* trees.c in Sources */,
+				9C6E9E4BA54733EF9F87E4B8 /* uncompr.c in Sources */,
+				42260A6F1853361083803B0D /* zutil.c in Sources */,
 				99E7A46106C03484BA70D29F /* tif_unix.c in Sources */,
 				4E396D8D2E9138D797F320C7 /* tif_aux.c in Sources */,
 				1EE845DDFDDE36CA8A218206 /* tif_close.c in Sources */,
@@ -5504,6 +5595,21 @@
 				E3B3E4F75D503DB89B5C622D /* stc.cpp in Sources */,
 				908957F65B7E36F8BF3858DD /* PlatWX.cpp in Sources */,
 				3E6AA08E72A030D39D867D4B /* ScintillaWX.cpp in Sources */,
+				F5B0B26BD0803719A3FCB4D7 /* adler32.c in Sources */,
+				BE3ED6EF34303867B8C8E923 /* compress.c in Sources */,
+				AC07BA4EA5403443914DFDB1 /* crc32.c in Sources */,
+				8DE45CEAF2DD3C22AA019F74 /* deflate.c in Sources */,
+				213CE0DD5B2335D0AD53B54A /* gzclose.c in Sources */,
+				0E8A0B8FA40E365690C20230 /* gzlib.c in Sources */,
+				4B996B4C54163D7091427DB5 /* gzread.c in Sources */,
+				4E2737AC738431EB9898B8B6 /* gzwrite.c in Sources */,
+				5EE94793DFCB3BA281A4864E /* infback.c in Sources */,
+				10743B74A58231639C6BF610 /* inffast.c in Sources */,
+				42AC484FDD7D3E948CEA801C /* inflate.c in Sources */,
+				3813146434693234965C4F31 /* inftrees.c in Sources */,
+				1CC5AEC6C08E3600801CDADA /* trees.c in Sources */,
+				9C6E9E4BA54733EF9F87E4B7 /* uncompr.c in Sources */,
+				42260A6F1853361083803B0C /* zutil.c in Sources */,
 				99E7A46106C03484BA70D29E /* tif_unix.c in Sources */,
 				4E396D8D2E9138D797F320C6 /* tif_aux.c in Sources */,
 				1EE845DDFDDE36CA8A218205 /* tif_close.c in Sources */,
@@ -5742,10 +5848,7 @@
 			buildSettings = {
 				EXECUTABLE_PREFIX = lib;
 				INSTALL_PATH = "@executable_path/../Frameworks/";
-				OTHER_LDFLAGS = (
+				OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
-					"$(OTHER_LDFLAGS)",
-					"-lz",
-				);
 			};
 			name = Debug;
 		};
@@ -5771,10 +5874,7 @@
 			buildSettings = {
 				EXECUTABLE_PREFIX = lib;
 				INSTALL_PATH = "@executable_path/../Frameworks/";
-				OTHER_LDFLAGS = (
+				OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
-					"$(OTHER_LDFLAGS)",
-					"-lz",
-				);
 			};
 			name = Release;
 		};

build/osx/wxcarbon_in.xcodeproj/project.pbxproj

@@ -187,10 +187,7 @@
 			buildSettings = {
 				EXECUTABLE_PREFIX = lib;
 				INSTALL_PATH = "@executable_path/../Frameworks/";
-				OTHER_LDFLAGS = (
+				OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
-					"$(OTHER_LDFLAGS)",
-					"-lz",
-				);
 			};
 			name = Debug;
 		};
@@ -200,10 +197,7 @@
 			buildSettings = {
 				EXECUTABLE_PREFIX = lib;
 				INSTALL_PATH = "@executable_path/../Frameworks/";
-				OTHER_LDFLAGS = (
+				OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
-					"$(OTHER_LDFLAGS)",
-					"-lz",
-				);
 			};
 			name = Release;
 		};

build/osx/wxcocoa.xcodeproj/project.pbxproj

@@ -119,6 +119,8 @@
 		0E024D145DDD38ACAE68F463 /* toplevel_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E2C8A7034343354841F7D8B /* toplevel_osx.cpp */; };
 		0E60E17BA4B23347A4F20160 /* gdicmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998D611109EC33A9A6A11C5A /* gdicmn.cpp */; };
 		0E60E17BA4B23347A4F20161 /* gdicmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998D611109EC33A9A6A11C5A /* gdicmn.cpp */; };
+		0E8A0B8FA40E365690C20230 /* gzlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 7395814D42CC38F6B8CD81B4 /* gzlib.c */; };
+		0E8A0B8FA40E365690C20231 /* gzlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 7395814D42CC38F6B8CD81B4 /* gzlib.c */; };
 		0E92CEF677AA32C9A8CDA0A7 /* checkbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */; };
 		0E92CEF677AA32C9A8CDA0A8 /* checkbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */; };
 		0EB6AB38A68D3845AC384A23 /* xh_text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53B95C9A1BCB30CC87495DA3 /* xh_text.cpp */; };
@@ -133,6 +135,8 @@
 		0FDDE8E193743F3A8CBDC67D /* richtextprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C4C45D3C63AA37CEBCE83321 /* richtextprint.cpp */; };
 		0FFFFA2F762B3160955D1D88 /* gauge_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC28591B403B32B7AFCC079D /* gauge_osx.cpp */; };
 		0FFFFA2F762B3160955D1D89 /* gauge_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC28591B403B32B7AFCC079D /* gauge_osx.cpp */; };
+		10743B74A58231639C6BF610 /* inffast.c in Sources */ = {isa = PBXBuildFile; fileRef = 400275BE019D3E5BA47988BE /* inffast.c */; };
+		10743B74A58231639C6BF611 /* inffast.c in Sources */ = {isa = PBXBuildFile; fileRef = 400275BE019D3E5BA47988BE /* inffast.c */; };
 		11818B68C5263EB68D708845 /* jdtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 4549845C0751356A907C23E0 /* jdtrans.c */; };
 		11818B68C5263EB68D708846 /* jdtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 4549845C0751356A907C23E0 /* jdtrans.c */; };
 		11DD420E32FB3EFB9DA0AB5B /* jccolor.c in Sources */ = {isa = PBXBuildFile; fileRef = 8EFF4707641D3F20AB602ED6 /* jccolor.c */; };
@@ -209,6 +213,8 @@
 		1C544DADDA6F3D62A5E25E94 /* LexerSimple.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CF502E0E4D853CBBBEC885EF /* LexerSimple.cxx */; };
 		1CBF34ACA39330028A5EA9AC /* xmlreshandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AD367F1047838A9A7A34DBF /* xmlreshandler.cpp */; };
 		1CBF34ACA39330028A5EA9AD /* xmlreshandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AD367F1047838A9A7A34DBF /* xmlreshandler.cpp */; };
+		1CC5AEC6C08E3600801CDADA /* trees.c in Sources */ = {isa = PBXBuildFile; fileRef = 95B4EDF38F8A3E5EBAFF560F /* trees.c */; };
+		1CC5AEC6C08E3600801CDADB /* trees.c in Sources */ = {isa = PBXBuildFile; fileRef = 95B4EDF38F8A3E5EBAFF560F /* trees.c */; };
 		1CD4F67F48CF3A5FA477D86E /* datavcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */; };
 		1CD4F67F48CF3A5FA477D86F /* datavcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */; };
 		1D726139C977341A97D0C931 /* datetimefmt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 864438709B363773B8C3382D /* datetimefmt.cpp */; };
@@ -249,6 +255,8 @@
 		20F10669703137E68318C6FE /* cmndata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0510EE0FB3FF36EF8670ABD1 /* cmndata.cpp */; };
 		2102C23970FB3F22AB46A59A /* LexTADS3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A284E855892F3A9E9E19E854 /* LexTADS3.cxx */; };
 		2102C23970FB3F22AB46A59B /* LexTADS3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A284E855892F3A9E9E19E854 /* LexTADS3.cxx */; };
+		213CE0DD5B2335D0AD53B54A /* gzclose.c in Sources */ = {isa = PBXBuildFile; fileRef = 7A24E9101688368296C21EBE /* gzclose.c */; };
+		213CE0DD5B2335D0AD53B54B /* gzclose.c in Sources */ = {isa = PBXBuildFile; fileRef = 7A24E9101688368296C21EBE /* gzclose.c */; };
 		219304C9DDA33E9AADB515DC /* datetimectrl_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D049F49C75043592B7E318B3 /* datetimectrl_osx.cpp */; };
 		219304C9DDA33E9AADB515DD /* datetimectrl_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D049F49C75043592B7E318B3 /* datetimectrl_osx.cpp */; };
 		21F74D4D4D84375AB155FD5B /* stattext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95186FEF3DEF39D8B1157BD5 /* stattext.mm */; };
@@ -421,6 +429,8 @@
 		37749AC3468836FC857BD0D6 /* checklstcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83A94241BCB13767AFEC5946 /* checklstcmn.cpp */; };
 		37DD17F479A1371ABF3589B9 /* xh_wizrd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */; };
 		37DD17F479A1371ABF3589BA /* xh_wizrd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */; };
+		3813146434693234965C4F31 /* inftrees.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D6B0D32537D35069C7E053F /* inftrees.c */; };
+		3813146434693234965C4F32 /* inftrees.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D6B0D32537D35069C7E053F /* inftrees.c */; };
 		383A6993E90936D39A5F12BD /* headerctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */; };
 		383A6993E90936D39A5F12BE /* headerctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */; };
 		39CC380F801F3EE984523275 /* auibar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05A4437E9697300390FDE14E /* auibar.cpp */; };
@@ -467,12 +477,16 @@
 		4040AE89BF9F34668091064B /* dragimgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A67053D16D63C588E555C84 /* dragimgg.cpp */; };
 		41943A8F82723027A151A468 /* fileconf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61DA2A4C0D143CBE804BB8A1 /* fileconf.cpp */; };
 		41943A8F82723027A151A469 /* fileconf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61DA2A4C0D143CBE804BB8A1 /* fileconf.cpp */; };
+		42260A6F1853361083803B0C /* zutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CB467F9898C3952A68D988B /* zutil.c */; };
+		42260A6F1853361083803B0D /* zutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CB467F9898C3952A68D988B /* zutil.c */; };
 		4269B85FDC5639BEB76A8AEB /* nonownedwnd_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */; };
 		4269B85FDC5639BEB76A8AEC /* nonownedwnd_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */; };
 		4279D39CAAF834F6A5B99196 /* persist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22D9626646773CED82449D5D /* persist.cpp */; };
 		4279D39CAAF834F6A5B99197 /* persist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22D9626646773CED82449D5D /* persist.cpp */; };
 		427E6AF88CF73D799206E37D /* checkboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FC2F076657431458896115A /* checkboxcmn.cpp */; };
 		427E6AF88CF73D799206E37E /* checkboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FC2F076657431458896115A /* checkboxcmn.cpp */; };
+		42AC484FDD7D3E948CEA801C /* inflate.c in Sources */ = {isa = PBXBuildFile; fileRef = B5370A676AAC32419D7FDD87 /* inflate.c */; };
+		42AC484FDD7D3E948CEA801D /* inflate.c in Sources */ = {isa = PBXBuildFile; fileRef = B5370A676AAC32419D7FDD87 /* inflate.c */; };
 		42ED9BAFD6E936849F1D36CB /* xtixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4048A3523EC03409BD899BEF /* xtixml.cpp */; };
 		42ED9BAFD6E936849F1D36CC /* xtixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4048A3523EC03409BD899BEF /* xtixml.cpp */; };
 		437519A6002A3A0FB2C9A8FC /* settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E6CC2B05353C3284B37B2DD7 /* settings.cpp */; };
@@ -525,6 +539,8 @@
 		4AEC67BF65B039D99F421667 /* statbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C87B071E3593A889704F512 /* statbar.cpp */; };
 		4B88254FF9963833A276A64C /* snglinst.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */; };
 		4B88254FF9963833A276A64D /* snglinst.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */; };
+		4B996B4C54163D7091427DB5 /* gzread.c in Sources */ = {isa = PBXBuildFile; fileRef = BAD4614CABC934D6AFF8D9CD /* gzread.c */; };
+		4B996B4C54163D7091427DB6 /* gzread.c in Sources */ = {isa = PBXBuildFile; fileRef = BAD4614CABC934D6AFF8D9CD /* gzread.c */; };
 		4BAFAE70A6B1313B96D86630 /* page.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59ED0C057D8F388A89DC7177 /* page.cpp */; };
 		4BAFAE70A6B1313B96D86631 /* page.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59ED0C057D8F388A89DC7177 /* page.cpp */; };
 		4C9BA36123E43589956864C6 /* Style.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C28429A964C337A192D76CC8 /* Style.cxx */; };
@@ -543,6 +559,8 @@
 		4DD98A9436C83CF3B9425A79 /* sysopt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F32F6B47EBB23068B1FCDC0D /* sysopt.cpp */; };
 		4E140367282F38C8A904A004 /* utilsexc_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81390F96937631078EFCD891 /* utilsexc_base.cpp */; };
 		4E140367282F38C8A904A005 /* utilsexc_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81390F96937631078EFCD891 /* utilsexc_base.cpp */; };
+		4E2737AC738431EB9898B8B6 /* gzwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E4E3EB1CCA53E0EA322A1AF /* gzwrite.c */; };
+		4E2737AC738431EB9898B8B7 /* gzwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E4E3EB1CCA53E0EA322A1AF /* gzwrite.c */; };
 		4E396D8D2E9138D797F320C6 /* tif_aux.c in Sources */ = {isa = PBXBuildFile; fileRef = D0CDADAF2D893E32A38351E4 /* tif_aux.c */; };
 		4E396D8D2E9138D797F320C7 /* tif_aux.c in Sources */ = {isa = PBXBuildFile; fileRef = D0CDADAF2D893E32A38351E4 /* tif_aux.c */; };
 		4F99EB97F65330C28EB4D077 /* datectrl_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95B4B2890C3A372DAB8DC7BA /* datectrl_osx.cpp */; };
@@ -621,6 +639,8 @@
 		5C5D0983160A36189A770743 /* webviewarchivehandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */; };
 		5DA146A9F7653F53BF5299E8 /* spinbutt.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3C4A7A93CAFC3E22A2A5F7F3 /* spinbutt.mm */; };
 		5DA146A9F7653F53BF5299E9 /* spinbutt.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3C4A7A93CAFC3E22A2A5F7F3 /* spinbutt.mm */; };
+		5EE94793DFCB3BA281A4864E /* infback.c in Sources */ = {isa = PBXBuildFile; fileRef = FDB0E2D0966C3E408C4A2D3D /* infback.c */; };
+		5EE94793DFCB3BA281A4864F /* infback.c in Sources */ = {isa = PBXBuildFile; fileRef = FDB0E2D0966C3E408C4A2D3D /* infback.c */; };
 		5F2C2A46781739D897CF293D /* xh_chckl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */; };
 		5F2C2A46781739D897CF293E /* xh_chckl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */; };
 		5F57C4908E5038D19D68ED7A /* gallery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F1C1EB5C0B3302C86D91315 /* gallery.cpp */; };
@@ -925,6 +945,8 @@
 		8C2B50E3FC7A37C58CC9DC0B /* colour.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CC8B73BB8C0391E9EC1B2D1 /* colour.mm */; };
 		8C52B1985BAA371FA22CCEBB /* combobox.mm in Sources */ = {isa = PBXBuildFile; fileRef = 57C06D5DB5F733A4A235B206 /* combobox.mm */; };
 		8C52B1985BAA371FA22CCEBC /* combobox.mm in Sources */ = {isa = PBXBuildFile; fileRef = 57C06D5DB5F733A4A235B206 /* combobox.mm */; };
+		8DE45CEAF2DD3C22AA019F74 /* deflate.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CF73F49AEC238C99CE89845 /* deflate.c */; };
+		8DE45CEAF2DD3C22AA019F75 /* deflate.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CF73F49AEC238C99CE89845 /* deflate.c */; };
 		8E674574343A3C009B1BCD00 /* tif_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 88FF67EB6E7D302A9CDEF660 /* tif_codec.c */; };
 		8E674574343A3C009B1BCD01 /* tif_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 88FF67EB6E7D302A9CDEF660 /* tif_codec.c */; };
 		8EE5A2467401365C8217AF2F /* preferences.mm in Sources */ = {isa = PBXBuildFile; fileRef = 835C22B71A0F3C469310E1E0 /* preferences.mm */; };
@@ -1021,6 +1043,8 @@
 		9B8E5690A6103FC1BDC6C47F /* pngread.c in Sources */ = {isa = PBXBuildFile; fileRef = 29D6506AEA5A323B8735F126 /* pngread.c */; };
 		9C1F073349FD393E9220C0D3 /* combog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CBD7B44E33373BCCB60FC11F /* combog.cpp */; };
 		9C1F073349FD393E9220C0D4 /* combog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CBD7B44E33373BCCB60FC11F /* combog.cpp */; };
+		9C6E9E4BA54733EF9F87E4B7 /* uncompr.c in Sources */ = {isa = PBXBuildFile; fileRef = 513033E36E643593AC305B3D /* uncompr.c */; };
+		9C6E9E4BA54733EF9F87E4B8 /* uncompr.c in Sources */ = {isa = PBXBuildFile; fileRef = 513033E36E643593AC305B3D /* uncompr.c */; };
 		9CA687845B3F30CCA44A89D0 /* choicbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 09F8B0818C3A3248A26EE05D /* choicbkg.cpp */; };
 		9CA687845B3F30CCA44A89D1 /* choicbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 09F8B0818C3A3248A26EE05D /* choicbkg.cpp */; };
 		9CC92BB4B0E233A0A7F81279 /* LexVisualProlog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 43D416CF0DE334E79A8E48C8 /* LexVisualProlog.cxx */; };
@@ -1117,6 +1141,8 @@
 		AB58406CEBA13BC4A2A83B67 /* printmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CC5C13F8AA1387BADB7E60C /* printmac.cpp */; };
 		ABCD15C4AB37396EA17B7B28 /* translation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6AC666417602346EA583709E /* translation.cpp */; };
 		ABCD15C4AB37396EA17B7B29 /* translation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6AC666417602346EA583709E /* translation.cpp */; };
+		AC07BA4EA5403443914DFDB1 /* crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = 7013DB195D023C31ADE68546 /* crc32.c */; };
+		AC07BA4EA5403443914DFDB2 /* crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = 7013DB195D023C31ADE68546 /* crc32.c */; };
 		AC0B0C52922B30188AE95E94 /* tabart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51054B41BFD83E97BAF76D07 /* tabart.cpp */; };
 		AC0B0C52922B30188AE95E95 /* tabart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51054B41BFD83E97BAF76D07 /* tabart.cpp */; };
 		AC6AC589EFB233C7B65A3224 /* overlaycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 303ACF199BE431BD891C9301 /* overlaycmn.cpp */; };
@@ -1223,6 +1249,8 @@
 		BDB7B2AD26CB356B8BEAAECE /* jchuff.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0FFDC7A6163F2DA73B84EB /* jchuff.c */; };
 		BDB8EF0E0DA03693BFB77EF7 /* accesscmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8555204EBA8930809B732842 /* accesscmn.cpp */; };
 		BDB8EF0E0DA03693BFB77EF8 /* accesscmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8555204EBA8930809B732842 /* accesscmn.cpp */; };
+		BE3ED6EF34303867B8C8E923 /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = D4C4495603293C07A3B09D54 /* compress.c */; };
+		BE3ED6EF34303867B8C8E924 /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = D4C4495603293C07A3B09D54 /* compress.c */; };
 		BE99A85EE76236CC8C719A64 /* xh_gauge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */; };
 		BE99A85EE76236CC8C719A65 /* xh_gauge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */; };
 		BEA90F2C6BB93143958F899A /* propgridiface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69E742B172463EDFBBFA5AB0 /* propgridiface.cpp */; };
@@ -1599,6 +1627,8 @@
 		F569D7A3F0E038E9B4CC2A77 /* xh_comboctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5FC445EFDC503C74A5CC6D7D /* xh_comboctrl.cpp */; };
 		F5806029B1BA3924A8FDDBC1 /* busyinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F94CF171F4532B89FECF475 /* busyinfo.cpp */; };
 		F5806029B1BA3924A8FDDBC2 /* busyinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F94CF171F4532B89FECF475 /* busyinfo.cpp */; };
+		F5B0B26BD0803719A3FCB4D7 /* adler32.c in Sources */ = {isa = PBXBuildFile; fileRef = 0E45F6DF601A34BCB3CC0206 /* adler32.c */; };
+		F5B0B26BD0803719A3FCB4D8 /* adler32.c in Sources */ = {isa = PBXBuildFile; fileRef = 0E45F6DF601A34BCB3CC0206 /* adler32.c */; };
 		F5D0BCF1A6C839E5829199E2 /* sizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */; };
 		F5D0BCF1A6C839E5829199E3 /* sizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */; };
 		F5D2146C94E733FAAB6D286A /* threadpsx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB466912FDA23F8B87A00A3C /* threadpsx.cpp */; };
@@ -1716,6 +1746,7 @@
 		0D3BD03BCE953D1B964EDB7A /* colourdata.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colourdata.cpp; path = ../../src/common/colourdata.cpp; sourceTree = "<group>"; };
 		0D9828C9BD9633C1A8F4E0CD /* LexRebol.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexRebol.cxx; path = ../../src/stc/scintilla/lexers/LexRebol.cxx; sourceTree = "<group>"; };
 		0DA80913C0E33144A42BD30F /* webview.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = webview.cpp; path = ../../src/common/webview.cpp; sourceTree = "<group>"; };
+		0E45F6DF601A34BCB3CC0206 /* adler32.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = adler32.c; path = ../../src/zlib/adler32.c; sourceTree = "<group>"; };
 		0E7BF9256DF533EBAE2B945E /* WordList.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = WordList.cxx; path = ../../src/stc/scintilla/lexlib/WordList.cxx; sourceTree = "<group>"; };
 		0E8036758CEC3296B555E4DF /* notebook.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = notebook.mm; path = ../../src/osx/cocoa/notebook.mm; sourceTree = "<group>"; };
 		0EB91E8407CB3300A19F387D /* ctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ctrlcmn.cpp; path = ../../src/common/ctrlcmn.cpp; sourceTree = "<group>"; };
@@ -1769,6 +1800,7 @@
 		1D799486AD7F336BB1F33DDC /* menu.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = menu.mm; path = ../../src/osx/cocoa/menu.mm; sourceTree = "<group>"; };
 		1DAF0931E4AD3E6581D7FDBC /* jidctint.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctint.c; path = ../../src/jpeg/jidctint.c; sourceTree = "<group>"; };
 		1E2FEBCEED2D33CFAAF75206 /* gbsizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gbsizer.cpp; path = ../../src/common/gbsizer.cpp; sourceTree = "<group>"; };
+		1E4E3EB1CCA53E0EA322A1AF /* gzwrite.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzwrite.c; path = ../../src/zlib/gzwrite.c; sourceTree = "<group>"; };
 		1EF103B09F02315282EC8F44 /* srchcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = srchcmn.cpp; path = ../../src/common/srchcmn.cpp; sourceTree = "<group>"; };
 		1EF327CE8D7E3C11BFC6BD74 /* jdapistd.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdapistd.c; path = ../../src/jpeg/jdapistd.c; sourceTree = "<group>"; };
 		1F6E23CCDC1932BC985EFBD2 /* sckipc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sckipc.cpp; path = ../../src/common/sckipc.cpp; sourceTree = "<group>"; };
@@ -1864,6 +1896,7 @@
 		3C131F7BF8A83960ACB26242 /* jidctflt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctflt.c; path = ../../src/jpeg/jidctflt.c; sourceTree = "<group>"; };
 		3C4A7A93CAFC3E22A2A5F7F3 /* spinbutt.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = spinbutt.mm; path = ../../src/osx/cocoa/spinbutt.mm; sourceTree = "<group>"; };
 		3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sizer.cpp; path = ../../src/common/sizer.cpp; sourceTree = "<group>"; };
+		3CF73F49AEC238C99CE89845 /* deflate.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = deflate.c; path = ../../src/zlib/deflate.c; sourceTree = "<group>"; };
 		3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = snglinst.cpp; path = ../../src/unix/snglinst.cpp; sourceTree = "<group>"; };
 		3D82E7D38BB43BB886E2BFA0 /* tif_getimage.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_getimage.c; path = ../../src/tiff/libtiff/tif_getimage.c; sourceTree = "<group>"; };
 		3DFD4F32E48039C3B9A66355 /* textcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textcmn.cpp; path = ../../src/common/textcmn.cpp; sourceTree = "<group>"; };
@@ -1874,6 +1907,7 @@
 		3F8836E29C5A370E80CE070E /* splash.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = splash.cpp; path = ../../src/generic/splash.cpp; sourceTree = "<group>"; };
 		3FB6D34C3029357EB64AECAA /* scrlwing.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = scrlwing.cpp; path = ../../src/generic/scrlwing.cpp; sourceTree = "<group>"; };
 		3FEBA7AC7F743EE88352AEBC /* htmlwin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmlwin.cpp; path = ../../src/html/htmlwin.cpp; sourceTree = "<group>"; };
+		400275BE019D3E5BA47988BE /* inffast.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = inffast.c; path = ../../src/zlib/inffast.c; sourceTree = "<group>"; };
 		4048A3523EC03409BD899BEF /* xtixml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xtixml.cpp; path = ../../src/common/xtixml.cpp; sourceTree = "<group>"; };
 		40586C8986443431A64EB066 /* LexLisp.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLisp.cxx; path = ../../src/stc/scintilla/lexers/LexLisp.cxx; sourceTree = "<group>"; };
 		4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_pixarlog.c; path = ../../src/tiff/libtiff/tif_pixarlog.c; sourceTree = "<group>"; };
@@ -1910,6 +1944,7 @@
 		4BA14FFC0F4B3AE0B4D6B185 /* jquant1.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jquant1.c; path = ../../src/jpeg/jquant1.c; sourceTree = "<group>"; };
 		4BA819575B5136B09FA8FEB1 /* pen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pen.cpp; path = ../../src/osx/pen.cpp; sourceTree = "<group>"; };
 		4C4649974D8B3A109D1BF145 /* art_internal.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = art_internal.cpp; path = ../../src/ribbon/art_internal.cpp; sourceTree = "<group>"; };
+		4CB467F9898C3952A68D988B /* zutil.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = zutil.c; path = ../../src/zlib/zutil.c; sourceTree = "<group>"; };
 		4EB3B255D20F3AE5A95230F6 /* LexCSS.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCSS.cxx; path = ../../src/stc/scintilla/lexers/LexCSS.cxx; sourceTree = "<group>"; };
 		4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CallTip.cxx; path = ../../src/stc/scintilla/src/CallTip.cxx; sourceTree = "<group>"; };
 		4F768B23D8B535CE8D0BD343 /* tif_jpeg_12.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_jpeg_12.c; path = ../../src/tiff/libtiff/tif_jpeg_12.c; sourceTree = "<group>"; };
@@ -1919,6 +1954,7 @@
 		4FE0B33481283D3493613B0F /* config.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = config.cpp; path = ../../src/common/config.cpp; sourceTree = "<group>"; };
 		508B04B4FF913BECBC9DBFFB /* LexSpecman.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSpecman.cxx; path = ../../src/stc/scintilla/lexers/LexSpecman.cxx; sourceTree = "<group>"; };
 		51054B41BFD83E97BAF76D07 /* tabart.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tabart.cpp; path = ../../src/aui/tabart.cpp; sourceTree = "<group>"; };
+		513033E36E643593AC305B3D /* uncompr.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = uncompr.c; path = ../../src/zlib/uncompr.c; sourceTree = "<group>"; };
 		5145561C78303EEE9F827962 /* LexLua.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLua.cxx; path = ../../src/stc/scintilla/lexers/LexLua.cxx; sourceTree = "<group>"; };
 		5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cfstring.cpp; path = ../../src/osx/core/cfstring.cpp; sourceTree = "<group>"; };
 		5190E3E110443FD29F2474FC /* treelist.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treelist.cpp; path = ../../src/generic/treelist.cpp; sourceTree = "<group>"; };
@@ -2034,6 +2070,7 @@
 		6EDDEEEC981133E8BA6A3998 /* jcapimin.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcapimin.c; path = ../../src/jpeg/jcapimin.c; sourceTree = "<group>"; };
 		6F23140777B733679D2FAAFC /* odcombocmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = odcombocmn.cpp; path = ../../src/common/odcombocmn.cpp; sourceTree = "<group>"; };
 		70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = webviewarchivehandler.cpp; path = ../../src/common/webviewarchivehandler.cpp; sourceTree = "<group>"; };
+		7013DB195D023C31ADE68546 /* crc32.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = crc32.c; path = ../../src/zlib/crc32.c; sourceTree = "<group>"; };
 		701B84EE7C043B539FF5195A /* textbuf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textbuf.cpp; path = ../../src/common/textbuf.cpp; sourceTree = "<group>"; };
 		7020ADB5D3E0375E875B418B /* LexA68k.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexA68k.cxx; path = ../../src/stc/scintilla/lexers/LexA68k.cxx; sourceTree = "<group>"; };
 		70E9B2C076673C87B4218A01 /* panelcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = panelcmn.cpp; path = ../../src/common/panelcmn.cpp; sourceTree = "<group>"; };
@@ -2047,6 +2084,7 @@
 		727F25F832AD32D4B12D8E39 /* m_span.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_span.cpp; path = ../../src/html/m_span.cpp; sourceTree = "<group>"; };
 		72869747E68E37998CB0A07E /* jdhuff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdhuff.c; path = ../../src/jpeg/jdhuff.c; sourceTree = "<group>"; };
 		72D7AF345E563587941BD868 /* longlong.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = longlong.cpp; path = ../../src/common/longlong.cpp; sourceTree = "<group>"; };
+		7395814D42CC38F6B8CD81B4 /* gzlib.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzlib.c; path = ../../src/zlib/gzlib.c; sourceTree = "<group>"; };
 		741578B590AF3F2CABE615EB /* timectrlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timectrlg.cpp; path = ../../src/generic/timectrlg.cpp; sourceTree = "<group>"; };
 		743EF8DB16CE371DA5C66623 /* statline.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = statline.mm; path = ../../src/osx/cocoa/statline.mm; sourceTree = "<group>"; };
 		757B31FCCA1F381C95B30DF8 /* app.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = app.cpp; path = ../../src/osx/carbon/app.cpp; sourceTree = "<group>"; };
@@ -2065,6 +2103,7 @@
 		7925E38823563BCDB5565DCF /* treebkg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treebkg.cpp; path = ../../src/generic/treebkg.cpp; sourceTree = "<group>"; };
 		7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtexthtml.cpp; path = ../../src/richtext/richtexthtml.cpp; sourceTree = "<group>"; };
 		7A1CE0B28CB73F90AE92B5AB /* richtooltipcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtooltipcmn.cpp; path = ../../src/common/richtooltipcmn.cpp; sourceTree = "<group>"; };
+		7A24E9101688368296C21EBE /* gzclose.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzclose.c; path = ../../src/zlib/gzclose.c; sourceTree = "<group>"; };
 		7A34C5BBBA543DC0A50DE1B6 /* event.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = event.cpp; path = ../../src/common/event.cpp; sourceTree = "<group>"; };
 		7A3F26F539473705AA82411D /* combobox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = combobox.cpp; path = ../../src/osx/carbon/combobox.cpp; sourceTree = "<group>"; };
 		7AF8F8A78A5130DCB4D46729 /* LexCmake.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCmake.cxx; path = ../../src/stc/scintilla/lexers/LexCmake.cxx; sourceTree = "<group>"; };
@@ -2155,6 +2194,7 @@
 		95186FEF3DEF39D8B1157BD5 /* stattext.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = stattext.mm; path = ../../src/osx/cocoa/stattext.mm; sourceTree = "<group>"; };
 		95A156A823B536DE8476E4F9 /* appbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = appbase.cpp; path = ../../src/common/appbase.cpp; sourceTree = "<group>"; };
 		95B4B2890C3A372DAB8DC7BA /* datectrl_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datectrl_osx.cpp; path = ../../src/osx/datectrl_osx.cpp; sourceTree = "<group>"; };
+		95B4EDF38F8A3E5EBAFF560F /* trees.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = trees.c; path = ../../src/zlib/trees.c; sourceTree = "<group>"; };
 		95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datavcmn.cpp; path = ../../src/common/datavcmn.cpp; sourceTree = "<group>"; };
 		95E2B80B2D7033808504DA8D /* utilsexc_cf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = utilsexc_cf.cpp; path = ../../src/osx/core/utilsexc_cf.cpp; sourceTree = "<group>"; };
 		9660AE8FEB7B3EDB857B9238 /* lboxcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = lboxcmn.cpp; path = ../../src/common/lboxcmn.cpp; sourceTree = "<group>"; };
@@ -2183,6 +2223,7 @@
 		9CC7C6FFD67233788EEDFC5E /* LexYAML.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexYAML.cxx; path = ../../src/stc/scintilla/lexers/LexYAML.cxx; sourceTree = "<group>"; };
 		9CE73979D0933A43830307E4 /* tif_packbits.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_packbits.c; path = ../../src/tiff/libtiff/tif_packbits.c; sourceTree = "<group>"; };
 		9D1F14339D1C331087650931 /* colour.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colour.cpp; path = ../../src/osx/core/colour.cpp; sourceTree = "<group>"; };
+		9D6B0D32537D35069C7E053F /* inftrees.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = inftrees.c; path = ../../src/zlib/inftrees.c; sourceTree = "<group>"; };
 		9DB43FAB1E563B02ACEFF647 /* module.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = module.cpp; path = ../../src/common/module.cpp; sourceTree = "<group>"; };
 		9DD609EC0591359C9A576A43 /* printdlg_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = printdlg_osx.cpp; path = ../../src/osx/printdlg_osx.cpp; sourceTree = "<group>"; };
 		9DE6A96FDD5D381D8B33D58E /* infobar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = infobar.cpp; path = ../../src/generic/infobar.cpp; sourceTree = "<group>"; };
@@ -2271,6 +2312,7 @@
 		B40E0F6AA0273ACD9BDEAD72 /* appunix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = appunix.cpp; path = ../../src/unix/appunix.cpp; sourceTree = "<group>"; };
 		B4DCCF66D880330A9EE9B6B2 /* xh_listb.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_listb.cpp; path = ../../src/xrc/xh_listb.cpp; sourceTree = "<group>"; };
 		B4E4032CA9883CA4B25BE082 /* xh_hyperlink.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_hyperlink.cpp; path = ../../src/xrc/xh_hyperlink.cpp; sourceTree = "<group>"; };
+		B5370A676AAC32419D7FDD87 /* inflate.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = inflate.c; path = ../../src/zlib/inflate.c; sourceTree = "<group>"; };
 		B540E18F9C91381CA175BABB /* art_msw.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = art_msw.cpp; path = ../../src/ribbon/art_msw.cpp; sourceTree = "<group>"; };
 		B558F1ED9346332D8C4BDFBC /* headercolcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = headercolcmn.cpp; path = ../../src/common/headercolcmn.cpp; sourceTree = "<group>"; };
 		B568A7364ECA30288820CCE7 /* mdi.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mdi.cpp; path = ../../src/osx/carbon/mdi.cpp; sourceTree = "<group>"; };
@@ -2292,6 +2334,7 @@
 		B9DFC4083C6A38CABE4BB4E3 /* LexD.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexD.cxx; path = ../../src/stc/scintilla/lexers/LexD.cxx; sourceTree = "<group>"; };
 		B9FD5AE12CA9376883AEE4FC /* tif_dirwrite.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dirwrite.c; path = ../../src/tiff/libtiff/tif_dirwrite.c; sourceTree = "<group>"; };
 		BACAA6CE4A0934459F26B27C /* graphicc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = graphicc.cpp; path = ../../src/generic/graphicc.cpp; sourceTree = "<group>"; };
+		BAD4614CABC934D6AFF8D9CD /* gzread.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzread.c; path = ../../src/zlib/gzread.c; sourceTree = "<group>"; };
 		BAD9A0BFED6A37E4A305E1D7 /* filename.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filename.cpp; path = ../../src/common/filename.cpp; sourceTree = "<group>"; };
 		BB3FF9FECCB5300A9561CE36 /* richtextsymboldlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextsymboldlg.cpp; path = ../../src/richtext/richtextsymboldlg.cpp; sourceTree = "<group>"; };
 		BB7661E9E09A397790ED9545 /* sockunix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sockunix.cpp; path = ../../src/unix/sockunix.cpp; sourceTree = "<group>"; };
@@ -2385,6 +2428,7 @@
 		D41D102919B232EBB72A6F2D /* LexTxt2tags.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexTxt2tags.cxx; path = ../../src/stc/scintilla/lexers/LexTxt2tags.cxx; sourceTree = "<group>"; };
 		D46A36564C78312CAC538E93 /* srchctlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = srchctlg.cpp; path = ../../src/generic/srchctlg.cpp; sourceTree = "<group>"; };
 		D4A23A8BC7373D4BBD72851D /* apptraits.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = apptraits.cpp; path = ../../src/unix/apptraits.cpp; sourceTree = "<group>"; };
+		D4C4495603293C07A3B09D54 /* compress.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = compress.c; path = ../../src/zlib/compress.c; sourceTree = "<group>"; };
 		D4E1DC1869C6327C80D2F5F4 /* uri.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uri.cpp; path = ../../src/common/uri.cpp; sourceTree = "<group>"; };
 		D4FC6F0AB2AC34D2B26F8ED8 /* markuptext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = markuptext.cpp; path = ../../src/generic/markuptext.cpp; sourceTree = "<group>"; };
 		D5B7B7C10A3E3C689AE1E418 /* wxrelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxrelease.xcconfig; sourceTree = "<group>"; };
@@ -2511,6 +2555,7 @@
 		FD5F11A3646F397BA62EB037 /* htmllbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmllbox.cpp; path = ../../src/generic/htmllbox.cpp; sourceTree = "<group>"; };
 		FD6D2664C05131C3A06E98B4 /* ExternalLexer.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ExternalLexer.cxx; path = ../../src/stc/scintilla/src/ExternalLexer.cxx; sourceTree = "<group>"; };
 		FDAEFCE0ED9D30DA94340A3B /* xtistrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xtistrm.cpp; path = ../../src/common/xtistrm.cpp; sourceTree = "<group>"; };
+		FDB0E2D0966C3E408C4A2D3D /* infback.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = infback.c; path = ../../src/zlib/infback.c; sourceTree = "<group>"; };
 		FDD3CE34439B3D2BBD9DC8D3 /* gridcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gridcmn.cpp; path = ../../src/common/gridcmn.cpp; sourceTree = "<group>"; };
 		FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextctrl.cpp; path = ../../src/richtext/richtextctrl.cpp; sourceTree = "<group>"; };
 		FE3B47058A723243A285594D /* LexMPT.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMPT.cxx; path = ../../src/stc/scintilla/lexers/LexMPT.cxx; sourceTree = "<group>"; };
@@ -2609,6 +2654,7 @@
 				B8F95052522B37AB86DA8917 /* propgrid */,
 				64B126D857113F24BA8C4758 /* richtext */,
 				E96566B813153B4295AD767B /* stc */,
+				52DDFBAA5ACC394FB6B30E74 /* libzlib */,
 				EB288BE7E74B3328B762A461 /* libtiff */,
 				7650A73F7FC9305EA62DAE86 /* libjpeg */,
 				6E2C8858F68E3FB0BEFFFCE5 /* libpng */,
@@ -2843,6 +2889,14 @@
 			name = src/richtext;
 			sourceTree = "<group>";
 		};
+		52DDFBAA5ACC394FB6B30E74 /* libzlib */ = {
+			isa = PBXGroup;
+			children = (
+				A7471B15D7093D38B8649962 /* src/zlib */,
+			);
+			name = libzlib;
+			sourceTree = "<group>";
+		};
 		5C5CD199E7573C73AE6F392D /* media */ = {
 			isa = PBXGroup;
 			children = (
@@ -3233,6 +3287,28 @@
 			name = src/tiff/libtiff;
 			sourceTree = "<group>";
 		};
+		A7471B15D7093D38B8649962 /* src/zlib */ = {
+			isa = PBXGroup;
+			children = (
+				0E45F6DF601A34BCB3CC0206 /* adler32.c */,
+				D4C4495603293C07A3B09D54 /* compress.c */,
+				7013DB195D023C31ADE68546 /* crc32.c */,
+				3CF73F49AEC238C99CE89845 /* deflate.c */,
+				7A24E9101688368296C21EBE /* gzclose.c */,
+				7395814D42CC38F6B8CD81B4 /* gzlib.c */,
+				BAD4614CABC934D6AFF8D9CD /* gzread.c */,
+				1E4E3EB1CCA53E0EA322A1AF /* gzwrite.c */,
+				FDB0E2D0966C3E408C4A2D3D /* infback.c */,
+				400275BE019D3E5BA47988BE /* inffast.c */,
+				B5370A676AAC32419D7FDD87 /* inflate.c */,
+				9D6B0D32537D35069C7E053F /* inftrees.c */,
+				95B4EDF38F8A3E5EBAFF560F /* trees.c */,
+				513033E36E643593AC305B3D /* uncompr.c */,
+				4CB467F9898C3952A68D988B /* zutil.c */,
+			);
+			name = src/zlib;
+			sourceTree = "<group>";
+		};
 		AC04244D4E183DF480908046 /* src/osx/core */ = {
 			isa = PBXGroup;
 			children = (
@@ -4691,6 +4767,21 @@
 				E3B3E4F75D503DB89B5C622E /* stc.cpp in Sources */,
 				908957F65B7E36F8BF3858DE /* PlatWX.cpp in Sources */,
 				3E6AA08E72A030D39D867D4C /* ScintillaWX.cpp in Sources */,
+				F5B0B26BD0803719A3FCB4D8 /* adler32.c in Sources */,
+				BE3ED6EF34303867B8C8E924 /* compress.c in Sources */,
+				AC07BA4EA5403443914DFDB2 /* crc32.c in Sources */,
+				8DE45CEAF2DD3C22AA019F75 /* deflate.c in Sources */,
+				213CE0DD5B2335D0AD53B54B /* gzclose.c in Sources */,
+				0E8A0B8FA40E365690C20231 /* gzlib.c in Sources */,
+				4B996B4C54163D7091427DB6 /* gzread.c in Sources */,
+				4E2737AC738431EB9898B8B7 /* gzwrite.c in Sources */,
+				5EE94793DFCB3BA281A4864F /* infback.c in Sources */,
+				10743B74A58231639C6BF611 /* inffast.c in Sources */,
+				42AC484FDD7D3E948CEA801D /* inflate.c in Sources */,
+				3813146434693234965C4F32 /* inftrees.c in Sources */,
+				1CC5AEC6C08E3600801CDADB /* trees.c in Sources */,
+				9C6E9E4BA54733EF9F87E4B8 /* uncompr.c in Sources */,
+				42260A6F1853361083803B0D /* zutil.c in Sources */,
 				99E7A46106C03484BA70D29F /* tif_unix.c in Sources */,
 				4E396D8D2E9138D797F320C7 /* tif_aux.c in Sources */,
 				1EE845DDFDDE36CA8A218206 /* tif_close.c in Sources */,
@@ -5532,6 +5623,21 @@
 				E3B3E4F75D503DB89B5C622D /* stc.cpp in Sources */,
 				908957F65B7E36F8BF3858DD /* PlatWX.cpp in Sources */,
 				3E6AA08E72A030D39D867D4B /* ScintillaWX.cpp in Sources */,
+				F5B0B26BD0803719A3FCB4D7 /* adler32.c in Sources */,
+				BE3ED6EF34303867B8C8E923 /* compress.c in Sources */,
+				AC07BA4EA5403443914DFDB1 /* crc32.c in Sources */,
+				8DE45CEAF2DD3C22AA019F74 /* deflate.c in Sources */,
+				213CE0DD5B2335D0AD53B54A /* gzclose.c in Sources */,
+				0E8A0B8FA40E365690C20230 /* gzlib.c in Sources */,
+				4B996B4C54163D7091427DB5 /* gzread.c in Sources */,
+				4E2737AC738431EB9898B8B6 /* gzwrite.c in Sources */,
+				5EE94793DFCB3BA281A4864E /* infback.c in Sources */,
+				10743B74A58231639C6BF610 /* inffast.c in Sources */,
+				42AC484FDD7D3E948CEA801C /* inflate.c in Sources */,
+				3813146434693234965C4F31 /* inftrees.c in Sources */,
+				1CC5AEC6C08E3600801CDADA /* trees.c in Sources */,
+				9C6E9E4BA54733EF9F87E4B7 /* uncompr.c in Sources */,
+				42260A6F1853361083803B0C /* zutil.c in Sources */,
 				99E7A46106C03484BA70D29E /* tif_unix.c in Sources */,
 				4E396D8D2E9138D797F320C6 /* tif_aux.c in Sources */,
 				1EE845DDFDDE36CA8A218205 /* tif_close.c in Sources */,
@@ -5774,10 +5880,7 @@
 					WXUSINGDLL,
 				);
 				INSTALL_PATH = "@executable_path/../Frameworks/";
-				OTHER_LDFLAGS = (
+				OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
-					"$(OTHER_LDFLAGS)",
-					"-lz",
-				);
 			};
 			name = Debug;
 		};
@@ -5807,10 +5910,7 @@
 					WXUSINGDLL,
 				);
 				INSTALL_PATH = "@executable_path/../Frameworks/";
-				OTHER_LDFLAGS = (
+				OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
-					"$(OTHER_LDFLAGS)",
-					"-lz",
-				);
 			};
 			name = Release;
 		};

build/osx/wxcocoa_in.xcodeproj/project.pbxproj

@@ -191,10 +191,7 @@
 					WXUSINGDLL,
 				);
 				INSTALL_PATH = "@executable_path/../Frameworks/";
-				OTHER_LDFLAGS = (
+				OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
-					"$(OTHER_LDFLAGS)",
-					"-lz",
-				);
 			};
 			name = Debug;
 		};
@@ -208,10 +205,7 @@
 					WXUSINGDLL,
 				);
 				INSTALL_PATH = "@executable_path/../Frameworks/";
-				OTHER_LDFLAGS = (
+				OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
-					"$(OTHER_LDFLAGS)",
-					"-lz",
-				);
 			};
 			name = Release;
 		};

build/osx/wxiphone.xcodeproj/project.pbxproj

@@ -62,6 +62,7 @@
 		0D79F1B4EF44393AA324213F /* LexPLM.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 62C46B0CE620348FBF3860A4 /* LexPLM.cxx */; };
 		0E024D145DDD38ACAE68F462 /* toplevel_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E2C8A7034343354841F7D8B /* toplevel_osx.cpp */; };
 		0E60E17BA4B23347A4F20160 /* gdicmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998D611109EC33A9A6A11C5A /* gdicmn.cpp */; };
+		0E8A0B8FA40E365690C20230 /* gzlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 7395814D42CC38F6B8CD81B4 /* gzlib.c */; };
 		0E92CEF677AA32C9A8CDA0A7 /* checkbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */; };
 		0EB6AB38A68D3845AC384A23 /* xh_text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53B95C9A1BCB30CC87495DA3 /* xh_text.cpp */; };
 		0F8C79010EF0316AA1B7392D /* LexTACL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9E5C91072D533919A78D8ED2 /* LexTACL.cxx */; };
@@ -69,6 +70,7 @@
 		0FBF7C9EDFB53D8DA0991B55 /* xh_notbk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A87662D69F0432FC96701280 /* xh_notbk.cpp */; };
 		0FDDE8E193743F3A8CBDC67C /* richtextprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C4C45D3C63AA37CEBCE83321 /* richtextprint.cpp */; };
 		0FFFFA2F762B3160955D1D88 /* gauge_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC28591B403B32B7AFCC079D /* gauge_osx.cpp */; };
+		10743B74A58231639C6BF610 /* inffast.c in Sources */ = {isa = PBXBuildFile; fileRef = 400275BE019D3E5BA47988BE /* inffast.c */; };
 		11818B68C5263EB68D708845 /* jdtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 4549845C0751356A907C23E0 /* jdtrans.c */; };
 		11DD420E32FB3EFB9DA0AB5B /* jccolor.c in Sources */ = {isa = PBXBuildFile; fileRef = 8EFF4707641D3F20AB602ED6 /* jccolor.c */; };
 		131B879180AE3FB481F81CC7 /* fs_mem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C9A305CEC03B3085B159B617 /* fs_mem.cpp */; };
@@ -105,6 +107,7 @@
 		1C52CB9487DF3AB9AF243B47 /* prntbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 242BF97B558634A79322052C /* prntbase.cpp */; };
 		1C544DADDA6F3D62A5E25E93 /* LexerSimple.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CF502E0E4D853CBBBEC885EF /* LexerSimple.cxx */; };
 		1CBF34ACA39330028A5EA9AC /* xmlreshandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AD367F1047838A9A7A34DBF /* xmlreshandler.cpp */; };
+		1CC5AEC6C08E3600801CDADA /* trees.c in Sources */ = {isa = PBXBuildFile; fileRef = 95B4EDF38F8A3E5EBAFF560F /* trees.c */; };
 		1CD4F67F48CF3A5FA477D86E /* datavcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */; };
 		1D726139C977341A97D0C931 /* datetimefmt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 864438709B363773B8C3382D /* datetimefmt.cpp */; };
 		1D7442C82B343F50A83B25B0 /* CharClassify.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5AFB85719CBC3D60BA2EDC2E /* CharClassify.cxx */; };
@@ -123,6 +126,7 @@
 		20BEEFFA08F3396791596870 /* dlunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA2D9F325F833C408657E7B7 /* dlunix.cpp */; };
 		20F10669703137E68318C6FD /* cmndata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0510EE0FB3FF36EF8670ABD1 /* cmndata.cpp */; };
 		2102C23970FB3F22AB46A59A /* LexTADS3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A284E855892F3A9E9E19E854 /* LexTADS3.cxx */; };
+		213CE0DD5B2335D0AD53B54A /* gzclose.c in Sources */ = {isa = PBXBuildFile; fileRef = 7A24E9101688368296C21EBE /* gzclose.c */; };
 		21F74D4D4D84375AB155FD5B /* stattext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95186FEF3DEF39D8B1157BD5 /* stattext.mm */; };
 		221DC4F6678A3EC5ACDDEA4F /* statbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F16A18CD9C23410B18592FD /* statbox_osx.cpp */; };
 		22AE900003F73134BBEE8BB6 /* dirctrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91292D8E11203A6B8E9767DA /* dirctrlg.cpp */; };
@@ -202,6 +206,7 @@
 		37715483D08335B790FFE058 /* filectrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5A756B733D093B09BE2098A6 /* filectrlcmn.cpp */; };
 		37749AC3468836FC857BD0D5 /* checklstcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83A94241BCB13767AFEC5946 /* checklstcmn.cpp */; };
 		37DD17F479A1371ABF3589B9 /* xh_wizrd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */; };
+		3813146434693234965C4F31 /* inftrees.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D6B0D32537D35069C7E053F /* inftrees.c */; };
 		383A6993E90936D39A5F12BD /* headerctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */; };
 		39CC380F801F3EE984523275 /* auibar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05A4437E9697300390FDE14E /* auibar.cpp */; };
 		39D6435B10073B85A499AFD8 /* dcbufcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FBC5A5797B0D369291A76D6E /* dcbufcmn.cpp */; };
@@ -225,9 +230,11 @@
 		403FBA20CEFE3EAFB4E6B905 /* dir.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F7332A03D93D3DABB050615D /* dir.cpp */; };
 		4040AE89BF9F34668091064A /* dragimgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A67053D16D63C588E555C84 /* dragimgg.cpp */; };
 		41943A8F82723027A151A468 /* fileconf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61DA2A4C0D143CBE804BB8A1 /* fileconf.cpp */; };
+		42260A6F1853361083803B0C /* zutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CB467F9898C3952A68D988B /* zutil.c */; };
 		4269B85FDC5639BEB76A8AEB /* nonownedwnd_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */; };
 		4279D39CAAF834F6A5B99196 /* persist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22D9626646773CED82449D5D /* persist.cpp */; };
 		427E6AF88CF73D799206E37D /* checkboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FC2F076657431458896115A /* checkboxcmn.cpp */; };
+		42AC484FDD7D3E948CEA801C /* inflate.c in Sources */ = {isa = PBXBuildFile; fileRef = B5370A676AAC32419D7FDD87 /* inflate.c */; };
 		42ED9BAFD6E936849F1D36CB /* xtixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4048A3523EC03409BD899BEF /* xtixml.cpp */; };
 		437519A6002A3A0FB2C9A8FC /* settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E6CC2B05353C3284B37B2DD7 /* settings.cpp */; };
 		438EAEA4B30C325C827F6197 /* xh_fontpicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 87E609641B583666AB9D1D58 /* xh_fontpicker.cpp */; };
@@ -254,6 +261,7 @@
 		49FE0228D8FD3F7AB64A4432 /* bmpbuttn_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38EF5FC5934C34D599FD6074 /* bmpbuttn_osx.cpp */; };
 		4AEC67BF65B039D99F421666 /* statbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C87B071E3593A889704F512 /* statbar.cpp */; };
 		4B88254FF9963833A276A64C /* snglinst.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */; };
+		4B996B4C54163D7091427DB5 /* gzread.c in Sources */ = {isa = PBXBuildFile; fileRef = BAD4614CABC934D6AFF8D9CD /* gzread.c */; };
 		4BAFAE70A6B1313B96D86630 /* page.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59ED0C057D8F388A89DC7177 /* page.cpp */; };
 		4C9BA36123E43589956864C6 /* Style.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C28429A964C337A192D76CC8 /* Style.cxx */; };
 		4CB3626391CE34D4B1F71AA0 /* jdatasrc.c in Sources */ = {isa = PBXBuildFile; fileRef = DECAF5DD80383A2CA76EB383 /* jdatasrc.c */; };
@@ -263,6 +271,7 @@
 		4DA209AEF4AD32AAB97F9718 /* htmlcell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68E5188DB6003C35A8C7754D /* htmlcell.cpp */; };
 		4DD98A9436C83CF3B9425A78 /* sysopt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F32F6B47EBB23068B1FCDC0D /* sysopt.cpp */; };
 		4E140367282F38C8A904A004 /* utilsexc_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81390F96937631078EFCD891 /* utilsexc_base.cpp */; };
+		4E2737AC738431EB9898B8B6 /* gzwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E4E3EB1CCA53E0EA322A1AF /* gzwrite.c */; };
 		4E396D8D2E9138D797F320C6 /* tif_aux.c in Sources */ = {isa = PBXBuildFile; fileRef = D0CDADAF2D893E32A38351E4 /* tif_aux.c */; };
 		50D7E093424138C88BB50D27 /* jcsample.c in Sources */ = {isa = PBXBuildFile; fileRef = 53D06E47477B3E32BB6B915E /* jcsample.c */; };
 		5116CE330E333724A66982E3 /* rearrangectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 972BC9B2B0D438EFB12BCE1E /* rearrangectrl.cpp */; };
@@ -298,6 +307,7 @@
 		5C3B0ED2EA973DFDBFBCC692 /* richtextctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */; };
 		5C44446AB150378696CD6B3C /* bmpcboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CF560E06F2A3B6088203D09 /* bmpcboxcmn.cpp */; };
 		5C5D0983160A36189A770742 /* webviewarchivehandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */; };
+		5EE94793DFCB3BA281A4864E /* infback.c in Sources */ = {isa = PBXBuildFile; fileRef = FDB0E2D0966C3E408C4A2D3D /* infback.c */; };
 		5F2C2A46781739D897CF293D /* xh_chckl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */; };
 		5F57C4908E5038D19D68ED7A /* gallery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F1C1EB5C0B3302C86D91315 /* gallery.cpp */; };
 		5F6B4F226B473AACB7AC8DF5 /* xh_slidr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38E0F60AE1F83633A0CC18FC /* xh_slidr.cpp */; };
@@ -444,6 +454,7 @@
 		8B38C6C416BA3A51B37F60C4 /* statlinecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292C08C0A1203654ABAA2CB1 /* statlinecmn.cpp */; };
 		8B60964DA1DF3F3DB40BE123 /* datavgen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F3D473DC5123EDAB767045C /* datavgen.cpp */; };
 		8B9C9FCB954F3596A4CED9A5 /* jdapimin.c in Sources */ = {isa = PBXBuildFile; fileRef = 86884BC843F6337EABF744BB /* jdapimin.c */; };
+		8DE45CEAF2DD3C22AA019F74 /* deflate.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CF73F49AEC238C99CE89845 /* deflate.c */; };
 		8E674574343A3C009B1BCD00 /* tif_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 88FF67EB6E7D302A9CDEF660 /* tif_codec.c */; };
 		8F98C20E7B223FF4B352C130 /* Catalogue.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 975E3B6A269434F0A069987D /* Catalogue.cxx */; };
 		8FB5FBC5730C33F1A3D85D9F /* LexD.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B9DFC4083C6A38CABE4BB4E3 /* LexD.cxx */; };
@@ -491,6 +502,7 @@
 		9B6A35E706543CDAA6A5014A /* LexGui4Cli.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FFB767BD2C7235F293F45796 /* LexGui4Cli.cxx */; };
 		9B8E5690A6103FC1BDC6C47E /* pngread.c in Sources */ = {isa = PBXBuildFile; fileRef = 29D6506AEA5A323B8735F126 /* pngread.c */; };
 		9C1F073349FD393E9220C0D3 /* combog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CBD7B44E33373BCCB60FC11F /* combog.cpp */; };
+		9C6E9E4BA54733EF9F87E4B7 /* uncompr.c in Sources */ = {isa = PBXBuildFile; fileRef = 513033E36E643593AC305B3D /* uncompr.c */; };
 		9CA687845B3F30CCA44A89D0 /* choicbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 09F8B0818C3A3248A26EE05D /* choicbkg.cpp */; };
 		9CC92BB4B0E233A0A7F81279 /* LexVisualProlog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 43D416CF0DE334E79A8E48C8 /* LexVisualProlog.cxx */; };
 		9D003890CB7035A298DB7056 /* LexLua.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5145561C78303EEE9F827962 /* LexLua.cxx */; };
@@ -539,6 +551,7 @@
 		AAC2CB4D851230008AE4ABA1 /* dcscreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22D6E6D9712338C6906CFAA4 /* dcscreen.cpp */; };
 		AB58406CEBA13BC4A2A83B66 /* printmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CC5C13F8AA1387BADB7E60C /* printmac.cpp */; };
 		ABCD15C4AB37396EA17B7B28 /* translation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6AC666417602346EA583709E /* translation.cpp */; };
+		AC07BA4EA5403443914DFDB1 /* crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = 7013DB195D023C31ADE68546 /* crc32.c */; };
 		AC0B0C52922B30188AE95E94 /* tabart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51054B41BFD83E97BAF76D07 /* tabart.cpp */; };
 		AC6AC589EFB233C7B65A3224 /* overlaycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 303ACF199BE431BD891C9301 /* overlaycmn.cpp */; };
 		AC91349D7F0E37739B1F5165 /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEF6B3FB66243812969E5BD1 /* palette.cpp */; };
@@ -590,6 +603,7 @@
 		BDAB44F5D017395D9D3A1F23 /* frame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3019BA65DD73F30A865365F /* frame.cpp */; };
 		BDB7B2AD26CB356B8BEAAECD /* jchuff.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0FFDC7A6163F2DA73B84EB /* jchuff.c */; };
 		BDB8EF0E0DA03693BFB77EF7 /* accesscmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8555204EBA8930809B732842 /* accesscmn.cpp */; };
+		BE3ED6EF34303867B8C8E923 /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = D4C4495603293C07A3B09D54 /* compress.c */; };
 		BE99A85EE76236CC8C719A64 /* xh_gauge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */; };
 		BEA90F2C6BB93143958F899A /* propgridiface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69E742B172463EDFBBFA5AB0 /* propgridiface.cpp */; };
 		BEAC2449AFA7304989BA301E /* fontpickerg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FBE8E520BA0530C6AD857434 /* fontpickerg.cpp */; };
@@ -774,6 +788,7 @@
 		F55F3887CDE633D7877C607B /* LexSmalltalk.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 3551A51B4A493090B67CA216 /* LexSmalltalk.cxx */; };
 		F569D7A3F0E038E9B4CC2A76 /* xh_comboctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5FC445EFDC503C74A5CC6D7D /* xh_comboctrl.cpp */; };
 		F5806029B1BA3924A8FDDBC1 /* busyinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F94CF171F4532B89FECF475 /* busyinfo.cpp */; };
+		F5B0B26BD0803719A3FCB4D7 /* adler32.c in Sources */ = {isa = PBXBuildFile; fileRef = 0E45F6DF601A34BCB3CC0206 /* adler32.c */; };
 		F5D0BCF1A6C839E5829199E2 /* sizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */; };
 		F5D2146C94E733FAAB6D286A /* threadpsx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB466912FDA23F8B87A00A3C /* threadpsx.cpp */; };
 		F5DF7AF0FA9E371BB71EF798 /* xh_listbk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EB0085AFB93BFC88AC6FFC /* xh_listbk.cpp */; };
@@ -852,6 +867,7 @@
 		0D3BD03BCE953D1B964EDB7A /* colourdata.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colourdata.cpp; path = ../../src/common/colourdata.cpp; sourceTree = "<group>"; };
 		0D9828C9BD9633C1A8F4E0CD /* LexRebol.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexRebol.cxx; path = ../../src/stc/scintilla/lexers/LexRebol.cxx; sourceTree = "<group>"; };
 		0DA80913C0E33144A42BD30F /* webview.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = webview.cpp; path = ../../src/common/webview.cpp; sourceTree = "<group>"; };
+		0E45F6DF601A34BCB3CC0206 /* adler32.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = adler32.c; path = ../../src/zlib/adler32.c; sourceTree = "<group>"; };
 		0E7BF9256DF533EBAE2B945E /* WordList.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = WordList.cxx; path = ../../src/stc/scintilla/lexlib/WordList.cxx; sourceTree = "<group>"; };
 		0EB91E8407CB3300A19F387D /* ctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ctrlcmn.cpp; path = ../../src/common/ctrlcmn.cpp; sourceTree = "<group>"; };
 		0EEAD9C3E180305D8899441E /* strvararg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = strvararg.cpp; path = ../../src/common/strvararg.cpp; sourceTree = "<group>"; };
@@ -900,6 +916,7 @@
 		1CE9B3DD54AD318FAA821732 /* richtextimagedlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextimagedlg.cpp; path = ../../src/richtext/richtextimagedlg.cpp; sourceTree = "<group>"; };
 		1DAF0931E4AD3E6581D7FDBC /* jidctint.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctint.c; path = ../../src/jpeg/jidctint.c; sourceTree = "<group>"; };
 		1E2FEBCEED2D33CFAAF75206 /* gbsizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gbsizer.cpp; path = ../../src/common/gbsizer.cpp; sourceTree = "<group>"; };
+		1E4E3EB1CCA53E0EA322A1AF /* gzwrite.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzwrite.c; path = ../../src/zlib/gzwrite.c; sourceTree = "<group>"; };
 		1EF103B09F02315282EC8F44 /* srchcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = srchcmn.cpp; path = ../../src/common/srchcmn.cpp; sourceTree = "<group>"; };
 		1EF327CE8D7E3C11BFC6BD74 /* jdapistd.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdapistd.c; path = ../../src/jpeg/jdapistd.c; sourceTree = "<group>"; };
 		1F6E23CCDC1932BC985EFBD2 /* sckipc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sckipc.cpp; path = ../../src/common/sckipc.cpp; sourceTree = "<group>"; };
@@ -990,6 +1007,7 @@
 		3BFC1F090EFE30B784CE4C64 /* xh_toolb.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_toolb.cpp; path = ../../src/xrc/xh_toolb.cpp; sourceTree = "<group>"; };
 		3C131F7BF8A83960ACB26242 /* jidctflt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctflt.c; path = ../../src/jpeg/jidctflt.c; sourceTree = "<group>"; };
 		3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sizer.cpp; path = ../../src/common/sizer.cpp; sourceTree = "<group>"; };
+		3CF73F49AEC238C99CE89845 /* deflate.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = deflate.c; path = ../../src/zlib/deflate.c; sourceTree = "<group>"; };
 		3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = snglinst.cpp; path = ../../src/unix/snglinst.cpp; sourceTree = "<group>"; };
 		3D82E7D38BB43BB886E2BFA0 /* tif_getimage.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_getimage.c; path = ../../src/tiff/libtiff/tif_getimage.c; sourceTree = "<group>"; };
 		3DFD4F32E48039C3B9A66355 /* textcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textcmn.cpp; path = ../../src/common/textcmn.cpp; sourceTree = "<group>"; };
@@ -1000,6 +1018,7 @@
 		3F8836E29C5A370E80CE070E /* splash.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = splash.cpp; path = ../../src/generic/splash.cpp; sourceTree = "<group>"; };
 		3FB6D34C3029357EB64AECAA /* scrlwing.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = scrlwing.cpp; path = ../../src/generic/scrlwing.cpp; sourceTree = "<group>"; };
 		3FEBA7AC7F743EE88352AEBC /* htmlwin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmlwin.cpp; path = ../../src/html/htmlwin.cpp; sourceTree = "<group>"; };
+		400275BE019D3E5BA47988BE /* inffast.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = inffast.c; path = ../../src/zlib/inffast.c; sourceTree = "<group>"; };
 		4048A3523EC03409BD899BEF /* xtixml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xtixml.cpp; path = ../../src/common/xtixml.cpp; sourceTree = "<group>"; };
 		40586C8986443431A64EB066 /* LexLisp.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLisp.cxx; path = ../../src/stc/scintilla/lexers/LexLisp.cxx; sourceTree = "<group>"; };
 		4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_pixarlog.c; path = ../../src/tiff/libtiff/tif_pixarlog.c; sourceTree = "<group>"; };
@@ -1036,6 +1055,7 @@
 		4BA14FFC0F4B3AE0B4D6B185 /* jquant1.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jquant1.c; path = ../../src/jpeg/jquant1.c; sourceTree = "<group>"; };
 		4BA819575B5136B09FA8FEB1 /* pen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pen.cpp; path = ../../src/osx/pen.cpp; sourceTree = "<group>"; };
 		4C4649974D8B3A109D1BF145 /* art_internal.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = art_internal.cpp; path = ../../src/ribbon/art_internal.cpp; sourceTree = "<group>"; };
+		4CB467F9898C3952A68D988B /* zutil.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = zutil.c; path = ../../src/zlib/zutil.c; sourceTree = "<group>"; };
 		4EB3B255D20F3AE5A95230F6 /* LexCSS.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCSS.cxx; path = ../../src/stc/scintilla/lexers/LexCSS.cxx; sourceTree = "<group>"; };
 		4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CallTip.cxx; path = ../../src/stc/scintilla/src/CallTip.cxx; sourceTree = "<group>"; };
 		4F768B23D8B535CE8D0BD343 /* tif_jpeg_12.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_jpeg_12.c; path = ../../src/tiff/libtiff/tif_jpeg_12.c; sourceTree = "<group>"; };
@@ -1045,6 +1065,7 @@
 		4FE0B33481283D3493613B0F /* config.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = config.cpp; path = ../../src/common/config.cpp; sourceTree = "<group>"; };
 		508B04B4FF913BECBC9DBFFB /* LexSpecman.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSpecman.cxx; path = ../../src/stc/scintilla/lexers/LexSpecman.cxx; sourceTree = "<group>"; };
 		51054B41BFD83E97BAF76D07 /* tabart.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tabart.cpp; path = ../../src/aui/tabart.cpp; sourceTree = "<group>"; };
+		513033E36E643593AC305B3D /* uncompr.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = uncompr.c; path = ../../src/zlib/uncompr.c; sourceTree = "<group>"; };
 		5145561C78303EEE9F827962 /* LexLua.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLua.cxx; path = ../../src/stc/scintilla/lexers/LexLua.cxx; sourceTree = "<group>"; };
 		5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cfstring.cpp; path = ../../src/osx/core/cfstring.cpp; sourceTree = "<group>"; };
 		5190E3E110443FD29F2474FC /* treelist.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treelist.cpp; path = ../../src/generic/treelist.cpp; sourceTree = "<group>"; };
@@ -1153,6 +1174,7 @@
 		6EDDEEEC981133E8BA6A3998 /* jcapimin.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcapimin.c; path = ../../src/jpeg/jcapimin.c; sourceTree = "<group>"; };
 		6F23140777B733679D2FAAFC /* odcombocmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = odcombocmn.cpp; path = ../../src/common/odcombocmn.cpp; sourceTree = "<group>"; };
 		70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = webviewarchivehandler.cpp; path = ../../src/common/webviewarchivehandler.cpp; sourceTree = "<group>"; };
+		7013DB195D023C31ADE68546 /* crc32.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = crc32.c; path = ../../src/zlib/crc32.c; sourceTree = "<group>"; };
 		701B84EE7C043B539FF5195A /* textbuf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textbuf.cpp; path = ../../src/common/textbuf.cpp; sourceTree = "<group>"; };
 		7020ADB5D3E0375E875B418B /* LexA68k.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexA68k.cxx; path = ../../src/stc/scintilla/lexers/LexA68k.cxx; sourceTree = "<group>"; };
 		70E9B2C076673C87B4218A01 /* panelcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = panelcmn.cpp; path = ../../src/common/panelcmn.cpp; sourceTree = "<group>"; };
@@ -1166,6 +1188,7 @@
 		727F25F832AD32D4B12D8E39 /* m_span.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_span.cpp; path = ../../src/html/m_span.cpp; sourceTree = "<group>"; };
 		72869747E68E37998CB0A07E /* jdhuff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdhuff.c; path = ../../src/jpeg/jdhuff.c; sourceTree = "<group>"; };
 		72D7AF345E563587941BD868 /* longlong.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = longlong.cpp; path = ../../src/common/longlong.cpp; sourceTree = "<group>"; };
+		7395814D42CC38F6B8CD81B4 /* gzlib.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzlib.c; path = ../../src/zlib/gzlib.c; sourceTree = "<group>"; };
 		741578B590AF3F2CABE615EB /* timectrlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timectrlg.cpp; path = ../../src/generic/timectrlg.cpp; sourceTree = "<group>"; };
 		757B31FCCA1F381C95B30DF8 /* app.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = app.cpp; path = ../../src/osx/carbon/app.cpp; sourceTree = "<group>"; };
 		75BF90BEF2F83BF28EC0458D /* stdpbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stdpbase.cpp; path = ../../src/common/stdpbase.cpp; sourceTree = "<group>"; };
@@ -1183,6 +1206,7 @@
 		7925E38823563BCDB5565DCF /* treebkg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treebkg.cpp; path = ../../src/generic/treebkg.cpp; sourceTree = "<group>"; };
 		7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtexthtml.cpp; path = ../../src/richtext/richtexthtml.cpp; sourceTree = "<group>"; };
 		7A1CE0B28CB73F90AE92B5AB /* richtooltipcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtooltipcmn.cpp; path = ../../src/common/richtooltipcmn.cpp; sourceTree = "<group>"; };
+		7A24E9101688368296C21EBE /* gzclose.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzclose.c; path = ../../src/zlib/gzclose.c; sourceTree = "<group>"; };
 		7A34C5BBBA543DC0A50DE1B6 /* event.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = event.cpp; path = ../../src/common/event.cpp; sourceTree = "<group>"; };
 		7A3F26F539473705AA82411D /* combobox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = combobox.cpp; path = ../../src/osx/carbon/combobox.cpp; sourceTree = "<group>"; };
 		7AF8F8A78A5130DCB4D46729 /* LexCmake.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCmake.cxx; path = ../../src/stc/scintilla/lexers/LexCmake.cxx; sourceTree = "<group>"; };
@@ -1268,6 +1292,7 @@
 		950D51915EF83B57B5E8306F /* xh_spin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_spin.cpp; path = ../../src/xrc/xh_spin.cpp; sourceTree = "<group>"; };
 		95186FEF3DEF39D8B1157BD5 /* stattext.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = stattext.mm; path = ../../src/osx/iphone/stattext.mm; sourceTree = "<group>"; };
 		95A156A823B536DE8476E4F9 /* appbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = appbase.cpp; path = ../../src/common/appbase.cpp; sourceTree = "<group>"; };
+		95B4EDF38F8A3E5EBAFF560F /* trees.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = trees.c; path = ../../src/zlib/trees.c; sourceTree = "<group>"; };
 		95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datavcmn.cpp; path = ../../src/common/datavcmn.cpp; sourceTree = "<group>"; };
 		95E2B80B2D7033808504DA8D /* utilsexc_cf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = utilsexc_cf.cpp; path = ../../src/osx/core/utilsexc_cf.cpp; sourceTree = "<group>"; };
 		9660AE8FEB7B3EDB857B9238 /* lboxcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = lboxcmn.cpp; path = ../../src/common/lboxcmn.cpp; sourceTree = "<group>"; };
@@ -1295,6 +1320,7 @@
 		9CC7C6FFD67233788EEDFC5E /* LexYAML.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexYAML.cxx; path = ../../src/stc/scintilla/lexers/LexYAML.cxx; sourceTree = "<group>"; };
 		9CE73979D0933A43830307E4 /* tif_packbits.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_packbits.c; path = ../../src/tiff/libtiff/tif_packbits.c; sourceTree = "<group>"; };
 		9D1F14339D1C331087650931 /* colour.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colour.cpp; path = ../../src/osx/core/colour.cpp; sourceTree = "<group>"; };
+		9D6B0D32537D35069C7E053F /* inftrees.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = inftrees.c; path = ../../src/zlib/inftrees.c; sourceTree = "<group>"; };
 		9DB43FAB1E563B02ACEFF647 /* module.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = module.cpp; path = ../../src/common/module.cpp; sourceTree = "<group>"; };
 		9DD609EC0591359C9A576A43 /* printdlg_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = printdlg_osx.cpp; path = ../../src/osx/printdlg_osx.cpp; sourceTree = "<group>"; };
 		9DE6A96FDD5D381D8B33D58E /* infobar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = infobar.cpp; path = ../../src/generic/infobar.cpp; sourceTree = "<group>"; };
@@ -1382,6 +1408,7 @@
 		B4DCCF66D880330A9EE9B6B2 /* xh_listb.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_listb.cpp; path = ../../src/xrc/xh_listb.cpp; sourceTree = "<group>"; };
 		B4DEA098A05736AE94F01926 /* libwx_osx_iphone.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libwx_osx_iphone.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		B4E4032CA9883CA4B25BE082 /* xh_hyperlink.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_hyperlink.cpp; path = ../../src/xrc/xh_hyperlink.cpp; sourceTree = "<group>"; };
+		B5370A676AAC32419D7FDD87 /* inflate.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = inflate.c; path = ../../src/zlib/inflate.c; sourceTree = "<group>"; };
 		B540E18F9C91381CA175BABB /* art_msw.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = art_msw.cpp; path = ../../src/ribbon/art_msw.cpp; sourceTree = "<group>"; };
 		B558F1ED9346332D8C4BDFBC /* headercolcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = headercolcmn.cpp; path = ../../src/common/headercolcmn.cpp; sourceTree = "<group>"; };
 		B568A7364ECA30288820CCE7 /* mdi.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mdi.cpp; path = ../../src/osx/carbon/mdi.cpp; sourceTree = "<group>"; };
@@ -1403,6 +1430,7 @@
 		B9DFC4083C6A38CABE4BB4E3 /* LexD.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexD.cxx; path = ../../src/stc/scintilla/lexers/LexD.cxx; sourceTree = "<group>"; };
 		B9FD5AE12CA9376883AEE4FC /* tif_dirwrite.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dirwrite.c; path = ../../src/tiff/libtiff/tif_dirwrite.c; sourceTree = "<group>"; };
 		BACAA6CE4A0934459F26B27C /* graphicc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = graphicc.cpp; path = ../../src/generic/graphicc.cpp; sourceTree = "<group>"; };
+		BAD4614CABC934D6AFF8D9CD /* gzread.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzread.c; path = ../../src/zlib/gzread.c; sourceTree = "<group>"; };
 		BAD9A0BFED6A37E4A305E1D7 /* filename.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filename.cpp; path = ../../src/common/filename.cpp; sourceTree = "<group>"; };
 		BB3FF9FECCB5300A9561CE36 /* richtextsymboldlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextsymboldlg.cpp; path = ../../src/richtext/richtextsymboldlg.cpp; sourceTree = "<group>"; };
 		BB7661E9E09A397790ED9545 /* sockunix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sockunix.cpp; path = ../../src/unix/sockunix.cpp; sourceTree = "<group>"; };
@@ -1493,6 +1521,7 @@
 		D41D102919B232EBB72A6F2D /* LexTxt2tags.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexTxt2tags.cxx; path = ../../src/stc/scintilla/lexers/LexTxt2tags.cxx; sourceTree = "<group>"; };
 		D46A36564C78312CAC538E93 /* srchctlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = srchctlg.cpp; path = ../../src/generic/srchctlg.cpp; sourceTree = "<group>"; };
 		D4A23A8BC7373D4BBD72851D /* apptraits.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = apptraits.cpp; path = ../../src/unix/apptraits.cpp; sourceTree = "<group>"; };
+		D4C4495603293C07A3B09D54 /* compress.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = compress.c; path = ../../src/zlib/compress.c; sourceTree = "<group>"; };
 		D4E1DC1869C6327C80D2F5F4 /* uri.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uri.cpp; path = ../../src/common/uri.cpp; sourceTree = "<group>"; };
 		D4FC6F0AB2AC34D2B26F8ED8 /* markuptext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = markuptext.cpp; path = ../../src/generic/markuptext.cpp; sourceTree = "<group>"; };
 		D5B7B7C10A3E3C689AE1E418 /* wxrelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxrelease.xcconfig; sourceTree = "<group>"; };
@@ -1619,6 +1648,7 @@
 		FD5F11A3646F397BA62EB037 /* htmllbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmllbox.cpp; path = ../../src/generic/htmllbox.cpp; sourceTree = "<group>"; };
 		FD6D2664C05131C3A06E98B4 /* ExternalLexer.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ExternalLexer.cxx; path = ../../src/stc/scintilla/src/ExternalLexer.cxx; sourceTree = "<group>"; };
 		FDAEFCE0ED9D30DA94340A3B /* xtistrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xtistrm.cpp; path = ../../src/common/xtistrm.cpp; sourceTree = "<group>"; };
+		FDB0E2D0966C3E408C4A2D3D /* infback.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = infback.c; path = ../../src/zlib/infback.c; sourceTree = "<group>"; };
 		FDD3CE34439B3D2BBD9DC8D3 /* gridcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gridcmn.cpp; path = ../../src/common/gridcmn.cpp; sourceTree = "<group>"; };
 		FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextctrl.cpp; path = ../../src/richtext/richtextctrl.cpp; sourceTree = "<group>"; };
 		FE3B47058A723243A285594D /* LexMPT.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMPT.cxx; path = ../../src/stc/scintilla/lexers/LexMPT.cxx; sourceTree = "<group>"; };
@@ -1663,6 +1693,7 @@
 				B8F95052522B37AB86DA8917 /* propgrid */,
 				64B126D857113F24BA8C4758 /* richtext */,
 				E96566B813153B4295AD767B /* stc */,
+				52DDFBAA5ACC394FB6B30E74 /* libzlib */,
 				EB288BE7E74B3328B762A461 /* libtiff */,
 				7650A73F7FC9305EA62DAE86 /* libjpeg */,
 				6E2C8858F68E3FB0BEFFFCE5 /* libpng */,
@@ -1937,6 +1968,14 @@
 			name = src/richtext;
 			sourceTree = "<group>";
 		};
+		52DDFBAA5ACC394FB6B30E74 /* libzlib */ = {
+			isa = PBXGroup;
+			children = (
+				A7471B15D7093D38B8649962 /* src/zlib */,
+			);
+			name = libzlib;
+			sourceTree = "<group>";
+		};
 		5C5CD199E7573C73AE6F392D /* media */ = {
 			isa = PBXGroup;
 			children = (
@@ -2335,6 +2374,28 @@
 			name = src/tiff/libtiff;
 			sourceTree = "<group>";
 		};
+		A7471B15D7093D38B8649962 /* src/zlib */ = {
+			isa = PBXGroup;
+			children = (
+				0E45F6DF601A34BCB3CC0206 /* adler32.c */,
+				D4C4495603293C07A3B09D54 /* compress.c */,
+				7013DB195D023C31ADE68546 /* crc32.c */,
+				3CF73F49AEC238C99CE89845 /* deflate.c */,
+				7A24E9101688368296C21EBE /* gzclose.c */,
+				7395814D42CC38F6B8CD81B4 /* gzlib.c */,
+				BAD4614CABC934D6AFF8D9CD /* gzread.c */,
+				1E4E3EB1CCA53E0EA322A1AF /* gzwrite.c */,
+				FDB0E2D0966C3E408C4A2D3D /* infback.c */,
+				400275BE019D3E5BA47988BE /* inffast.c */,
+				B5370A676AAC32419D7FDD87 /* inflate.c */,
+				9D6B0D32537D35069C7E053F /* inftrees.c */,
+				95B4EDF38F8A3E5EBAFF560F /* trees.c */,
+				513033E36E643593AC305B3D /* uncompr.c */,
+				4CB467F9898C3952A68D988B /* zutil.c */,
+			);
+			name = src/zlib;
+			sourceTree = "<group>";
+		};
 		AC04244D4E183DF480908046 /* src/osx/core */ = {
 			isa = PBXGroup;
 			children = (
@@ -3673,6 +3734,21 @@
 				E3B3E4F75D503DB89B5C622D /* stc.cpp in Sources */,
 				908957F65B7E36F8BF3858DD /* PlatWX.cpp in Sources */,
 				3E6AA08E72A030D39D867D4B /* ScintillaWX.cpp in Sources */,
+				F5B0B26BD0803719A3FCB4D7 /* adler32.c in Sources */,
+				BE3ED6EF34303867B8C8E923 /* compress.c in Sources */,
+				AC07BA4EA5403443914DFDB1 /* crc32.c in Sources */,
+				8DE45CEAF2DD3C22AA019F74 /* deflate.c in Sources */,
+				213CE0DD5B2335D0AD53B54A /* gzclose.c in Sources */,
+				0E8A0B8FA40E365690C20230 /* gzlib.c in Sources */,
+				4B996B4C54163D7091427DB5 /* gzread.c in Sources */,
+				4E2737AC738431EB9898B8B6 /* gzwrite.c in Sources */,
+				5EE94793DFCB3BA281A4864E /* infback.c in Sources */,
+				10743B74A58231639C6BF610 /* inffast.c in Sources */,
+				42AC484FDD7D3E948CEA801C /* inflate.c in Sources */,
+				3813146434693234965C4F31 /* inftrees.c in Sources */,
+				1CC5AEC6C08E3600801CDADA /* trees.c in Sources */,
+				9C6E9E4BA54733EF9F87E4B7 /* uncompr.c in Sources */,
+				42260A6F1853361083803B0C /* zutil.c in Sources */,
 				99E7A46106C03484BA70D29E /* tif_unix.c in Sources */,
 				4E396D8D2E9138D797F320C6 /* tif_aux.c in Sources */,
 				1EE845DDFDDE36CA8A218205 /* tif_close.c in Sources */,

samples/minimal/minimal_carbon.xcodeproj/project.pbxproj

@@ -254,10 +254,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 40E3518610EF31130029DC34 /* wxcarbon.xcconfig */;
 			buildSettings = {
-				OTHER_LDFLAGS = (
+				OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
-					"$(OTHER_LDFLAGS)",
-					"-lz",
-				);
 				PRODUCT_NAME = minimal_carbon;
 			};
 			name = Debug;
@@ -266,10 +263,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 40E3518610EF31130029DC34 /* wxcarbon.xcconfig */;
 			buildSettings = {
-				OTHER_LDFLAGS = (
+				OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
-					"$(OTHER_LDFLAGS)",
-					"-lz",
-				);
 				PRODUCT_NAME = minimal_carbon;
 			};
 			name = Release;

samples/minimal/minimal_cocoa.xcodeproj/project.pbxproj

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

samples/minimal/minimal_iphone.xcodeproj/project.pbxproj

@@ -203,7 +203,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 404BEE0510EC7BF20080E2B8 /* wxiphone.xcconfig */;
 			buildSettings = {
-				OTHER_LDFLAGS = "-lz";
+				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = minimal_iphone;
 			};
 			name = Debug;