adding built-in zlib sources, see #16192

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2014-04-21 18:37:25 +00:00
parent 52b633eeea
commit 7354e1461e

View File

@@ -43,11 +43,11 @@ on parseLib(theElement, theVariables, theConditions)
end parseLib end parseLib
on parseNode(anElement, theVariables, theConditions) on parseNode(anElement, theVariables, theConditions)
if class of anElement is XML element and <EFBFBD> if class of anElement is XML element and
XML tag of anElement is "set" then XML tag of anElement is "set" then
parseEntry(anElement, theVariables, theConditions) parseEntry(anElement, theVariables, theConditions)
else else
if class of anElement is XML element and <EFBFBD> if class of anElement is XML element and
XML tag of anElement is "lib" then XML tag of anElement is "lib" then
parseLib(anElement, theVariables, theConditions) parseLib(anElement, theVariables, theConditions)
end if end if
@@ -215,30 +215,31 @@ end makeProject
-- main -- main
init() init()
set theProject to {projectName:"", conditions:{}, bklfiles:{<EFBFBD> set theProject to {projectName:"", conditions:{}, bklfiles:{
"../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:{
{label:"base", entries:{"$(BASE_SRC)"}}, <EFBFBD> {label:"base", entries:{"$(BASE_SRC)"}},
{label:"base", entries:{"$(BASE_AND_GUI_SRC)"}}, <EFBFBD> {label:"base", entries:{"$(BASE_AND_GUI_SRC)"}},
{label:"core", entries:{"$(CORE_SRC)"}}, <EFBFBD> {label:"core", entries:{"$(CORE_SRC)"}},
{label:"net", entries:{"$(NET_SRC)"}}, <EFBFBD> {label:"net", entries:{"$(NET_SRC)"}},
{label:"adv", entries:{"$(ADVANCED_SRC)"}}, <EFBFBD> {label:"adv", entries:{"$(ADVANCED_SRC)"}},
{label:"webview", entries:{"$(WEBVIEW_SRC)"}}, <EFBFBD> {label:"webview", entries:{"$(WEBVIEW_SRC)"}},
{label:"media", entries:{"$(MEDIA_SRC)"}}, <EFBFBD> {label:"media", entries:{"$(MEDIA_SRC)"}},
{label:"html", entries:{"$(HTML_SRC)"}}, <EFBFBD> {label:"html", entries:{"$(HTML_SRC)"}},
{label:"xrc", entries:{"$(XRC_SRC)"}}, <EFBFBD> {label:"xrc", entries:{"$(XRC_SRC)"}},
{label:"xml", entries:{"$(XML_SRC)"}}, <EFBFBD> {label:"xml", entries:{"$(XML_SRC)"}},
{label:"opengl", entries:{"$(OPENGL_SRC)"}}, <EFBFBD> {label:"opengl", entries:{"$(OPENGL_SRC)"}},
{label:"aui", entries:{"$(AUI_SRC)"}}, <EFBFBD> {label:"aui", entries:{"$(AUI_SRC)"}},
{label:"ribbon", entries:{"$(RIBBON_SRC)"}}, <EFBFBD> {label:"ribbon", entries:{"$(RIBBON_SRC)"}},
{label:"propgrid", entries:{"$(PROPGRID_SRC)"}}, <EFBFBD> {label:"propgrid", entries:{"$(PROPGRID_SRC)"}},
{label:"richtext", entries:{"$(RICHTEXT_SRC)"}}, <EFBFBD> {label:"richtext", entries:{"$(RICHTEXT_SRC)"}},
{label:"stc", entries:{"$(STC_SRC)"}}, <EFBFBD> {label:"stc", entries:{"$(STC_SRC)"}},
{label:"libtiff", entries:{"$(wxtiff)"}}, <EFBFBD> {label:"libzlib", entries:{"$(wxzlib)"}},
{label:"libjpeg", entries:{"$(wxjpeg)"}}, <EFBFBD> {label:"libtiff", entries:{"$(wxtiff)"}},
{label:"libpng", entries:{"$(wxpng)"}}, <EFBFBD> {label:"libjpeg", entries:{"$(wxjpeg)"}},
{label:"libregex", entries:{"$(wxregex)"}}, <EFBFBD> {label:"libpng", entries:{"$(wxpng)"}},
{label:"libscintilla", entries:{"$(wxscintilla)"}}, <EFBFBD> {label:"libregex", entries:{"$(wxregex)"}},
{label:"libexpat", entries:{"$(wxexpat)"}} <EFBFBD> {label:"libscintilla", entries:{"$(wxscintilla)"}},
{label:"libexpat", entries:{"$(wxexpat)"}}
}} }}
set conditions of theProject to {"PLATFORM_MACOSX=='1'", "TOOLKIT=='OSX_CARBON'", "WXUNIV=='0'", "USE_GUI=='1' and WXUNIV=='0'"} set conditions of theProject to {"PLATFORM_MACOSX=='1'", "TOOLKIT=='OSX_CARBON'", "WXUNIV=='0'", "USE_GUI=='1' and WXUNIV=='0'"}
set projectName of theProject to "wxcarbon" set projectName of theProject to "wxcarbon"