X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ae3b602b140585313c38658efd08c39f141c90d..daebb44c74bdbdc8ce43bd4aa471774d92f35f02:/build/bakefiles/multilib.bkl diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl index 5cd3ef0d6a..f2cef3f424 100644 --- a/build/bakefiles/multilib.bkl +++ b/build/bakefiles/multilib.bkl @@ -2,11 +2,11 @@ - + - + WXMAKINGDLL_BASE @@ -14,21 +14,21 @@ $(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 - - + + - + WXUSINGDLL @@ -37,99 +37,93 @@ $(NET_CMN_HDR) $(NET_PLATFORM_HDR) basedll - + $(NET_SRC) $(NET_CMN_HDR) $(NET_PLATFORM_HDR) - + 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 - - + + - + WXUSINGDLL WXMAKINGDLL_ADV $(ADVANCED_SRC) $(PLUGIN_ADV_SRC) $(ADVANCED_HDR) + htmldll + xmldll coredll basedll $(PLUGIN_ADV_EXTRALIBS) - + $(ADVANCED_SRC) $(PLUGIN_ADV_SRC) $(ADVANCED_HDR) - + adv=advlib+advdll - - + + - + + cond="SHARED=='1' and USE_MEDIA=='1' and USE_GUI=='1' and MONOLITHIC=='0'"> WXUSINGDLL WXMAKINGDLL_MEDIA $(MEDIA_SRC) $(MEDIA_HDR) coredll basedll - - - + + cond="SHARED=='0' and USE_MEDIA=='1' and USE_GUI=='1' and MONOLITHIC=='0'"> $(MEDIA_SRC) $(MEDIA_HDR) - + media=medialib+mediadll - + WXUSINGDLL @@ -139,14 +133,14 @@ basedll $(EXTRALIBS_ODBC) - + $(ODBC_SRC) $(ODBC_HDR) - - + + WXUSINGDLL @@ -158,23 +152,23 @@ coredll basedll - + $(DBGRID_SRC) $(DBGRID_HDR) - + odbc=odbclib+odbcdll dbgrid=dbgridlib+dbgriddll - + - + + cond="SHARED=='1' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'"> WXUSINGDLL WXMAKINGDLL_HTML $(HTML_SRC) @@ -183,28 +177,51 @@ $(EXTRALIBS_HTML) $(HTML_HDR) - + + cond="SHARED=='0' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'"> $(HTML_SRC) $(HTML_HDR) - + html=htmllib+htmldll - + - + gl=gllib+gldll - - + + + + + + + + WXUSINGDLL + WXMAKINGDLL_QA + $(QA_SRC) + $(QA_HDR) + coredll + basedll + xmldll + + + + $(QA_SRC) + $(QA_HDR) + + + qa=qalib+qadll + - + WXUSINGDLL @@ -214,19 +231,19 @@ basedll $(EXTRALIBS_XML) - + $(XML_SRC) $(XML_HDR) - + xml=xmllib+xmldll - + - + WXUSINGDLL @@ -239,13 +256,13 @@ basedll $(XRC_HDR) - + $(XRC_SRC) $(XRC_HDR) - + xrc=xrclib+xrcdll - +