Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash with newer OS X builds running on older.

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

Closes #16192.


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

3
build/osx/makeprojects.applescript
View File

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