From 7354e1461eee067c859b8d201414aa50688a4e2a Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Mon, 21 Apr 2014 18:37:25 +0000 Subject: [PATCH] adding built-in zlib sources, see #16192 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/osx/makeprojects.applescript | 53 +++++++++++++++--------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/build/osx/makeprojects.applescript b/build/osx/makeprojects.applescript index 0f6fe076b3..79b373ff6e 100644 --- a/build/osx/makeprojects.applescript +++ b/build/osx/makeprojects.applescript @@ -43,11 +43,11 @@ on parseLib(theElement, theVariables, theConditions) end parseLib on parseNode(anElement, theVariables, theConditions) - if class of anElement is XML element and  + if class of anElement is XML element and ᅡ XML tag of anElement is "set" then parseEntry(anElement, theVariables, theConditions) else - if class of anElement is XML element and  + if class of anElement is XML element and ᅡ XML tag of anElement is "lib" then parseLib(anElement, theVariables, theConditions) end if @@ -215,30 +215,31 @@ end makeProject -- main init() -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:{ - {label:"base", entries:{"$(BASE_SRC)"}},  - {label:"base", entries:{"$(BASE_AND_GUI_SRC)"}},  - {label:"core", entries:{"$(CORE_SRC)"}},  - {label:"net", entries:{"$(NET_SRC)"}},  - {label:"adv", entries:{"$(ADVANCED_SRC)"}},  - {label:"webview", entries:{"$(WEBVIEW_SRC)"}},  - {label:"media", entries:{"$(MEDIA_SRC)"}},  - {label:"html", entries:{"$(HTML_SRC)"}},  - {label:"xrc", entries:{"$(XRC_SRC)"}},  - {label:"xml", entries:{"$(XML_SRC)"}},  - {label:"opengl", entries:{"$(OPENGL_SRC)"}},  - {label:"aui", entries:{"$(AUI_SRC)"}},  - {label:"ribbon", entries:{"$(RIBBON_SRC)"}},  - {label:"propgrid", entries:{"$(PROPGRID_SRC)"}},  - {label:"richtext", entries:{"$(RICHTEXT_SRC)"}},  - {label:"stc", entries:{"$(STC_SRC)"}},  - {label:"libtiff", entries:{"$(wxtiff)"}},  - {label:"libjpeg", entries:{"$(wxjpeg)"}},  - {label:"libpng", entries:{"$(wxpng)"}},  - {label:"libregex", entries:{"$(wxregex)"}},  - {label:"libscintilla", entries:{"$(wxscintilla)"}},  - {label:"libexpat", entries:{"$(wxexpat)"}}  +set theProject to {projectName:"", conditions:{}, bklfiles:{ᅡ + "../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)"}}, ᅡ + {label:"base", entries:{"$(BASE_AND_GUI_SRC)"}}, ᅡ + {label:"core", entries:{"$(CORE_SRC)"}}, ᅡ + {label:"net", entries:{"$(NET_SRC)"}}, ᅡ + {label:"adv", entries:{"$(ADVANCED_SRC)"}}, ᅡ + {label:"webview", entries:{"$(WEBVIEW_SRC)"}}, ᅡ + {label:"media", entries:{"$(MEDIA_SRC)"}}, ᅡ + {label:"html", entries:{"$(HTML_SRC)"}}, ᅡ + {label:"xrc", entries:{"$(XRC_SRC)"}}, ᅡ + {label:"xml", entries:{"$(XML_SRC)"}}, ᅡ + {label:"opengl", entries:{"$(OPENGL_SRC)"}}, ᅡ + {label:"aui", entries:{"$(AUI_SRC)"}}, ᅡ + {label:"ribbon", entries:{"$(RIBBON_SRC)"}}, ᅡ + {label:"propgrid", entries:{"$(PROPGRID_SRC)"}}, ᅡ + {label:"richtext", entries:{"$(RICHTEXT_SRC)"}}, ᅡ + {label:"stc", entries:{"$(STC_SRC)"}}, ᅡ + {label:"libzlib", entries:{"$(wxzlib)"}}, ᅡ + {label:"libtiff", entries:{"$(wxtiff)"}}, ᅡ + {label:"libjpeg", entries:{"$(wxjpeg)"}}, ᅡ + {label:"libpng", entries:{"$(wxpng)"}}, ᅡ + {label:"libregex", entries:{"$(wxregex)"}}, ᅡ + {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 projectName of theProject to "wxcarbon"