X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a69544bf4dec77e719518237280a7eb6e81f3708..32485259c1342115488d219776dfebeb3d4d81b1:/build/bakefiles/multilib.bkl diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl index 2222ab8f73..9fa593c932 100644 --- a/build/bakefiles/multilib.bkl +++ b/build/bakefiles/multilib.bkl @@ -2,87 +2,265 @@ <!-- $Id$ --> <makefile> - + <!-- ================================================================= --> <!-- wxBase library --> <!-- ================================================================= --> - + <dll id="basedll" template="wx_base_dll" cond="SHARED=='1' and MONOLITHIC=='0'"> <define>WXMAKINGDLL_BASE</define> <define>wxUSE_BASE=1</define> - <define>wxUSE_GUI=0</define> <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources> + <msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers> </dll> - + <lib id="baselib" template="wx_base_lib" cond="SHARED=='0' and MONOLITHIC=='0'"> - <define>wxUSE_BASE=1</define> - <define>wxUSE_GUI=0</define> + <define>wxUSE_BASE=1</define> <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources> + <msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers> + </lib> + + <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">base=baselib+basedll</set> + + + <!-- ================================================================= --> + <!-- wxNet library --> + <!-- ================================================================= --> + + <dll id="netdll" template="wx_base_dll" + cond="SHARED=='1' and MONOLITHIC=='0'"> + <define>WXUSINGDLL</define> + <define>WXMAKINGDLL_NET</define> + <sources>$(NET_SRC)</sources> + <msvc-headers>$(NET_CMN_HDR) $(NET_PLATFORM_HDR)</msvc-headers> + <library>basedll</library> + </dll> + + <lib id="netlib" template="wx_base_lib" + cond="SHARED=='0' and MONOLITHIC=='0'"> + <sources>$(NET_SRC)</sources> + <msvc-headers>$(NET_CMN_HDR) $(NET_PLATFORM_HDR)</msvc-headers> </lib> + <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">net=netlib+netdll</set> + + <!-- ================================================================= --> <!-- Main GUI library --> <!-- ================================================================= --> - + <dll id="coredll" template="wx_dll" cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'"> <define>WXUSINGDLL</define> <define>WXMAKINGDLL_CORE</define> - <define>wxUSE_BASE=0</define> + <define>wxUSE_BASE=0</define> <sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources> + <msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers> <library>basedll</library> </dll> - + <lib id="corelib" template="wx_lib" cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'"> - <define>wxUSE_BASE=0</define> + <define>wxUSE_BASE=0</define> <sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources> + <msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers> + </lib> + + <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">core=corelib+coredll</set> + + + <!-- ================================================================= --> + <!-- "Advanced" controls library --> + <!-- ================================================================= --> + + <dll id="advdll" template="wx_dll" + cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'"> + <define>WXUSINGDLL</define> + <define>WXMAKINGDLL_ADV</define> + <sources>$(ADVANCED_SRC) $(PLUGIN_ADV_SRC)</sources> + <msvc-headers>$(ADVANCED_HDR)</msvc-headers> + <library>coredll</library> + <library>basedll</library> + <ldlibs>$(PLUGIN_ADV_EXTRALIBS)</ldlibs> + </dll> + + <lib id="advlib" template="wx_lib" + cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'"> + <sources>$(ADVANCED_SRC) $(PLUGIN_ADV_SRC)</sources> + <msvc-headers>$(ADVANCED_HDR)</msvc-headers> + </lib> + + <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">adv=advlib+advdll</set> + + + <!-- ================================================================= --> + <!-- wxMedia classes library --> + <!-- ================================================================= --> + + <dll id="mediadll" template="wx_dll" + cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'"> + <define>WXUSINGDLL</define> + <define>WXMAKINGDLL_MEDIA</define> + <sources>$(MEDIA_SRC)</sources> + <msvc-headers>$(MEDIA_HDR)</msvc-headers> + <library>coredll</library> + <library>basedll</library> + </dll> + + <lib id="medialib" template="wx_lib" + cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'"> + <sources>$(MEDIA_SRC)</sources> + <msvc-headers>$(MEDIA_HDR)</msvc-headers> + </lib> + + <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">media=medialib+mediadll</set> + + + <!-- ================================================================= --> + <!-- DB classes library --> + <!-- ================================================================= --> + + <dll id="odbcdll" template="wx_base_dll" + cond="SHARED=='1' and USE_ODBC=='1' and MONOLITHIC=='0'"> + <define>WXUSINGDLL</define> + <define>WXMAKINGDLL_ODBC</define> + <sources>$(ODBC_SRC)</sources> + <msvc-headers>$(ODBC_HDR)</msvc-headers> + <library>basedll</library> + <ldlibs>$(EXTRALIBS_ODBC)</ldlibs> + </dll> + + <lib id="odbclib" template="wx_base_lib" + cond="SHARED=='0' and USE_ODBC=='1' and MONOLITHIC=='0'"> + <sources>$(ODBC_SRC)</sources> + <msvc-headers>$(ODBC_HDR)</msvc-headers> + </lib> + + + <dll id="dbgriddll" template="wx_dll" + cond="SHARED=='1' and USE_GUI=='1' and USE_ODBC=='1' and MONOLITHIC=='0'"> + <define>WXUSINGDLL</define> + <define>WXMAKINGDLL_DBGRID</define> + <sources>$(DBGRID_SRC)</sources> + <msvc-headers>$(DBGRID_HDR)</msvc-headers> + <library>advdll</library> + <library>odbcdll</library> + <library>coredll</library> + <library>basedll</library> + </dll> + + <lib id="dbgridlib" template="wx_lib" + cond="SHARED=='0' and USE_GUI=='1' and USE_ODBC=='1' and MONOLITHIC=='0'"> + <sources>$(DBGRID_SRC)</sources> + <msvc-headers>$(DBGRID_HDR)</msvc-headers> </lib> - + <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">odbc=odbclib+odbcdll</set> + <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">dbgrid=dbgridlib+dbgriddll</set> + + <!-- ================================================================ --> <!-- wxHTML --> <!-- ================================================================ --> - + <dll id="htmldll" template="wx_dll" - cond="SHARED=='1' and USE_HTML=='1' and MONOLITHIC=='0'"> + cond="SHARED=='1' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'"> <define>WXUSINGDLL</define> <define>WXMAKINGDLL_HTML</define> <sources>$(HTML_SRC)</sources> <library>coredll</library> <library>basedll</library> + <ldlibs>$(EXTRALIBS_HTML)</ldlibs> + <msvc-headers>$(HTML_HDR)</msvc-headers> </dll> - + <lib id="htmllib" template="wx_lib" - cond="SHARED=='0' and USE_HTML=='1' and MONOLITHIC=='0'"> + cond="SHARED=='0' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'"> <sources>$(HTML_SRC)</sources> + <msvc-headers>$(HTML_HDR)</msvc-headers> </lib> - + + <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">html=htmllib+htmldll</set> + <!-- ================================================================ --> <!-- OpenGL --> <!-- ================================================================ --> <!-- included by wx.bkl from opengl.bkl --> - - + + <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">gl=gllib+gldll</set> + + + <!-- ================================================================ --> + <!-- QA --> + <!-- ================================================================ --> + + <dll id="qadll" template="wx_dll" + cond="SHARED=='1' and USE_GUI=='1' and USE_QA=='1' and MONOLITHIC=='0'"> + <define>WXUSINGDLL</define> + <define>WXMAKINGDLL_QA</define> + <sources>$(QA_SRC)</sources> + <msvc-headers>$(QA_HDR)</msvc-headers> + <library>coredll</library> + <library>basedll</library> + <library>xmldll</library> + </dll> + + <lib id="qalib" template="wx_lib" + cond="SHARED=='0' and USE_GUI=='1' and USE_QA=='1' and MONOLITHIC=='0'"> + <sources>$(QA_SRC)</sources> + <msvc-headers>$(QA_HDR)</msvc-headers> + </lib> + + <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">qa=qalib+qadll</set> + <!-- ================================================================ --> <!-- XML --> <!-- ================================================================ --> - + <dll id="xmldll" template="wx_base_dll" cond="SHARED=='1' and MONOLITHIC=='0'"> <define>WXUSINGDLL</define> <define>WXMAKINGDLL_XML</define> <sources>$(XML_SRC)</sources> + <msvc-headers>$(XML_HDR)</msvc-headers> <library>basedll</library> <ldlibs>$(EXTRALIBS_XML)</ldlibs> </dll> - + <lib id="xmllib" template="wx_base_lib" cond="SHARED=='0' and MONOLITHIC=='0'"> <sources>$(XML_SRC)</sources> + <msvc-headers>$(XML_HDR)</msvc-headers> </lib> + <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xml=xmllib+xmldll</set> + + <!-- ================================================================ --> + <!-- XRC --> + <!-- ================================================================ --> + + <dll id="xrcdll" template="wx_dll" + cond="SHARED=='1' and USE_XRC=='1' and MONOLITHIC=='0'"> + <define>WXUSINGDLL</define> + <define>WXMAKINGDLL_XRC</define> + <sources>$(XRC_SRC)</sources> + <library>htmldll</library> + <library>advdll</library> + <library>coredll</library> + <library>xmldll</library> + <library>basedll</library> + <msvc-headers>$(XRC_HDR)</msvc-headers> + </dll> + + <lib id="xrclib" template="wx_lib" + cond="SHARED=='0' and USE_XRC=='1' and MONOLITHIC=='0'"> + <sources>$(XRC_SRC)</sources> + <msvc-headers>$(XRC_HDR)</msvc-headers> + </lib> + + <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xrc=xrclib+xrcdll</set> + </makefile>