X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c79241a238663d524ba4b9b63bcf9952f3d58609..7505b72ead138a4c33c67479bc0db51500b63576:/build/bakefiles/multilib.bkl diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl index 2c2688e145..93e5848a4e 100644 --- a/build/bakefiles/multilib.bkl +++ b/build/bakefiles/multilib.bkl @@ -2,11 +2,25 @@ - + + + + + - + WXMAKINGDLL_BASE @@ -14,21 +28,23 @@ $(BASE_SRC) $(BASE_AND_GUI_SRC) $(BASE_CMN_HDR) $(BASE_PLATFORM_HDR) - + - wxUSE_BASE=1 + wxUSE_BASE=1 $(BASE_SRC) $(BASE_AND_GUI_SRC) $(BASE_CMN_HDR) $(BASE_PLATFORM_HDR) - base=baselib+basedll - - + + + base=baselib+basedll + + - + WXUSINGDLL @@ -37,44 +53,48 @@ $(NET_CMN_HDR) $(NET_PLATFORM_HDR) basedll - + $(NET_SRC) $(NET_CMN_HDR) $(NET_PLATFORM_HDR) - - net=netlib+netdll - + + + net=netlib+netdll + + - + WXUSINGDLL WXMAKINGDLL_CORE - wxUSE_BASE=0 + wxUSE_BASE=0 $(BASE_AND_GUI_SRC) $(CORE_SRC) $(ALL_GUI_HEADERS) basedll - + - wxUSE_BASE=0 + wxUSE_BASE=0 $(BASE_AND_GUI_SRC) $(CORE_SRC) $(ALL_GUI_HEADERS) - - core=corelib+coredll - - + + + + core=corelib+coredll + + - + WXUSINGDLL @@ -85,65 +105,50 @@ basedll $(PLUGIN_ADV_EXTRALIBS) - + $(ADVANCED_SRC) $(PLUGIN_ADV_SRC) $(ADVANCED_HDR) - - adv=advlib+advdll - - + + + + adv=advlib+advdll + + - + - - - WXUSINGDLL - WXMAKINGDLL_ODBC - $(ODBC_SRC) - $(ODBC_HDR) - basedll - $(EXTRALIBS_ODBC) - - - - $(ODBC_SRC) - $(ODBC_HDR) - - - - + + WXUSINGDLL - WXMAKINGDLL_DBGRID - $(DBGRID_SRC) - $(DBGRID_HDR) - advdll - odbcdll + WXMAKINGDLL_MEDIA + $(MEDIA_SRC) + $(MEDIA_HDR) coredll basedll + $(EXTRALIBS_MEDIA) - - - $(DBGRID_SRC) - $(DBGRID_HDR) + + + $(MEDIA_SRC) + $(MEDIA_HDR) - - odbc=odbclib+odbcdll - dbgrid=dbgridlib+dbgriddll - + + + media=medialib+mediadll + + - + + cond="SHARED=='1' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'"> WXUSINGDLL WXMAKINGDLL_HTML $(HTML_SRC) @@ -152,28 +157,60 @@ $(EXTRALIBS_HTML) $(HTML_HDR) - + + + + htmldll + + + cond="SHARED=='0' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'"> $(HTML_SRC) $(HTML_HDR) - - html=htmllib+htmldll - + + + + html=htmllib+htmldll + - - gl=gllib+gldll - - + + gl=gllib+gldll + + + + + + + + WXUSINGDLL + WXMAKINGDLL_QA + $(QA_SRC) + $(QA_HDR) + coredll + basedll + xmldll + + + + $(QA_SRC) + $(QA_HDR) + + + + + qa=qalib+qadll + - + WXUSINGDLL @@ -183,13 +220,153 @@ basedll $(EXTRALIBS_XML) - + $(XML_SRC) $(XML_HDR) + + + + xml=xmllib+xmldll + + + + + + + WXUSINGDLL + WXMAKINGDLL_XRC + $(XRC_SRC) + $(htmldll_library_link) + advdll + coredll + xmldll + basedll + $(XRC_HDR) + + + + $(XRC_SRC) + $(XRC_HDR) + + + + + xrc=xrclib+xrcdll + + + + + + + WXUSINGDLL + WXMAKINGDLL_AUI + $(AUI_SRC) + advdll + coredll + basedll + $(AUI_HDR) + + + + $(AUI_SRC) + $(AUI_HDR) + - xml=xmllib+xmldll + + + aui=auilib+auidll + + + + + + + WXUSINGDLL + WXMAKINGDLL_PROPGRID + $(PROPGRID_SRC) + advdll + coredll + basedll + $(PROPGRID_HDR) + + + + $(PROPGRID_SRC) + $(PROPGRID_HDR) + + + + propgrid=propgridlib+propgriddll + + + + + + + WXUSINGDLL + WXMAKINGDLL_RICHTEXT + $(RICHTEXT_SRC) + advdll + $(htmldll_library_link) + xmldll + coredll + basedll + $(RICHTEXT_HDR) + + + + $(RICHTEXT_SRC) + $(RICHTEXT_HDR) + + + + + richtext=richtextlib+richtextdll + + + + + + + + + WXUSINGDLL + WXMAKINGDLL_STC + $(STC_SRC) + coredll + basedll + $(STC_HDR) + + + + $(STC_SRC) + $(STC_HDR) + + + + + stc=stclib+stcdll +