X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47b6ebde0909b1c98fcbce066032d9e753ad9482..5313727812e1636f4c4aeceea3f9e93d01cfce43:/build/bakefiles/multilib.bkl?ds=sidebyside
diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index d22fff6067..545ca64ce7 100644
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -3,6 +3,20 @@
<makefile>
+ <define-rule name="wxshortcut" extends="phony">
+ <template>
+ <set var="name">$(id.replace('wx',''))</set>
+ <set var="namedll">
+ <if cond="SHARED=='1'">$(name)dll</if>
+ </set>
+ <set var="namelib">
+ <if cond="SHARED=='0'">$(name)lib</if>
+ </set>
+ <depends>$(namedll)</depends>
+ <depends>$(namelib)</depends>
+ </template>
+ </define-rule>
+
<!-- ================================================================= -->
<!-- wxBase library -->
<!-- ================================================================= -->
@@ -22,6 +36,8 @@
<msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
</lib>
+ <wxshortcut id="wxbase" cond="MONOLITHIC=='0'"/>
+
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">base=baselib+basedll</set>
@@ -44,6 +60,8 @@
<msvc-headers>$(NET_CMN_HDR) $(NET_PLATFORM_HDR)</msvc-headers>
</lib>
+ <wxshortcut id="wxnet" cond="MONOLITHIC=='0'"/>
+
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">net=netlib+netdll</set>
@@ -68,6 +86,8 @@
<msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers>
</lib>
+ <wxshortcut id="wxcore" cond="MONOLITHIC=='0' and USE_GUI=='1'"/>
+
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">core=corelib+coredll</set>
@@ -92,6 +112,8 @@
<msvc-headers>$(ADVANCED_HDR)</msvc-headers>
</lib>
+ <wxshortcut id="wxadv" cond="MONOLITHIC=='0' and USE_GUI=='1'"/>
+
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">adv=advlib+advdll</set>
@@ -107,6 +129,7 @@
<msvc-headers>$(MEDIA_HDR)</msvc-headers>
<library>coredll</library>
<library>basedll</library>
+ <ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
</dll>
<lib id="medialib" template="wx_lib"
@@ -115,50 +138,9 @@
<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>
-
+ <wxshortcut id="wxmedia" cond="MONOLITHIC=='0' and USE_GUI=='1' and USE_MEDIA=='1'"/>
- <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>
+ <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">media=medialib+mediadll</set>
<!-- ================================================================ -->
@@ -187,8 +169,34 @@
<msvc-headers>$(HTML_HDR)</msvc-headers>
</lib>
+ <wxshortcut id="wxhtml" cond="MONOLITHIC=='0' and USE_HTML=='1'"/>
+
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">html=htmllib+htmldll</set>
+ <!-- ================================================================ -->
+ <!-- wxWEBVIEW -->
+ <!-- ================================================================ -->
+
+ <dll id="webviewdll" template="wx_dll"
+ cond="SHARED=='1' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
+ <define>WXUSINGDLL</define>
+ <define>WXMAKINGDLL_WEBVIEW</define>
+ <sources>$(WEBVIEW_SRC)</sources>
+ <library>coredll</library>
+ <library>basedll</library>
+ <msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
+ </dll>
+
+ <lib id="webviewlib" template="wx_lib"
+ cond="SHARED=='0' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
+ <sources>$(WEBVIEW_SRC)</sources>
+ <msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
+ </lib>
+
+ <wxshortcut id="wxwebview" cond="MONOLITHIC=='0' and USE_WEBVIEW=='1'"/>
+
+ <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">webview=webviewlib+webviewdll</set>
+
<!-- ================================================================ -->
<!-- OpenGL -->
<!-- ================================================================ -->
@@ -219,6 +227,8 @@
<msvc-headers>$(QA_HDR)</msvc-headers>
</lib>
+ <wxshortcut id="wxqa" cond="MONOLITHIC=='0' and USE_QA=='1'"/>
+
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">qa=qalib+qadll</set>
<!-- ================================================================ -->
@@ -241,6 +251,8 @@
<msvc-headers>$(XML_HDR)</msvc-headers>
</lib>
+ <wxshortcut id="wxxml" cond="MONOLITHIC=='0'"/>
+
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xml=xmllib+xmldll</set>
<!-- ================================================================ -->
@@ -266,6 +278,8 @@
<msvc-headers>$(XRC_HDR)</msvc-headers>
</lib>
+ <wxshortcut id="wxxrc" cond="MONOLITHIC=='0' and USE_XRC=='1'"/>
+
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xrc=xrclib+xrcdll</set>
<!-- ================================================================ -->
@@ -288,8 +302,60 @@
<sources>$(AUI_SRC)</sources>
<msvc-headers>$(AUI_HDR)</msvc-headers>
</lib>
+
+ <wxshortcut id="wxaui" cond="MONOLITHIC=='0' and USE_AUI=='1'"/>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">aui=auilib+auidll</set>
+
+ <!-- ================================================================ -->
+ <!-- RIBBON -->
+ <!-- ================================================================ -->
+
+ <dll id="ribbondll" template="wx_dll"
+ cond="SHARED=='1' and USE_RIBBON=='1' and MONOLITHIC=='0'">
+ <define>WXUSINGDLL</define>
+ <define>WXMAKINGDLL_RIBBON</define>
+ <sources>$(RIBBON_SRC)</sources>
+ <library>advdll</library>
+ <library>coredll</library>
+ <library>basedll</library>
+ <msvc-headers>$(RIBBON_HDR)</msvc-headers>
+ </dll>
+
+ <lib id="ribbonlib" template="wx_lib"
+ cond="SHARED=='0' and USE_RIBBON=='1' and MONOLITHIC=='0'">
+ <sources>$(RIBBON_SRC)</sources>
+ <msvc-headers>$(RIBBON_HDR)</msvc-headers>
+ </lib>
+
+ <wxshortcut id="wxribbon" cond="MONOLITHIC=='0' and USE_RIBBON=='1'"/>
+
+ <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">ribbon=ribbonlib+ribbondll</set>
+
+ <!-- ================================================================ -->
+ <!-- PROPGRID -->
+ <!-- ================================================================ -->
+
+ <dll id="propgriddll" template="wx_dll"
+ cond="SHARED=='1' and USE_PROPGRID=='1' and MONOLITHIC=='0'">
+ <define>WXUSINGDLL</define>
+ <define>WXMAKINGDLL_PROPGRID</define>
+ <sources>$(PROPGRID_SRC)</sources>
+ <library>advdll</library>
+ <library>coredll</library>
+ <library>basedll</library>
+ <msvc-headers>$(PROPGRID_HDR)</msvc-headers>
+ </dll>
+
+ <lib id="propgridlib" template="wx_lib"
+ cond="SHARED=='0' and USE_PROPGRID=='1' and MONOLITHIC=='0'">
+ <sources>$(PROPGRID_SRC)</sources>
+ <msvc-headers>$(PROPGRID_HDR)</msvc-headers>
+ </lib>
+
+ <wxshortcut id="wxpropgrid" cond="MONOLITHIC=='0' and USE_PROPGRID=='1'"/>
+
+ <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">propgrid=propgridlib+propgriddll</set>
<!-- ================================================================ -->
<!-- RICHTEXT -->
@@ -313,7 +379,37 @@
<sources>$(RICHTEXT_SRC)</sources>
<msvc-headers>$(RICHTEXT_HDR)</msvc-headers>
</lib>
+
+ <wxshortcut id="wxrichtext" cond="MONOLITHIC=='0' and USE_RICHTEXT=='1'"/>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">richtext=richtextlib+richtextdll</set>
+ <!-- ================================================================ -->
+ <!-- STC -->
+ <!-- ================================================================ -->
+
+ <template id="stc_base" template="wxscintilla_cppflags">
+ <library>wxscintilla</library>
+ </template>
+
+ <dll id="stcdll" template="wx_dll,stc_base"
+ cond="SHARED=='1' and USE_STC=='1' and MONOLITHIC=='0'">
+ <define>WXUSINGDLL</define>
+ <define>WXMAKINGDLL_STC</define>
+ <sources>$(STC_SRC)</sources>
+ <library>coredll</library>
+ <library>basedll</library>
+ <msvc-headers>$(STC_HDR)</msvc-headers>
+ </dll>
+
+ <lib id="stclib" template="wx_lib,stc_base"
+ cond="SHARED=='0' and USE_STC=='1' and MONOLITHIC=='0'">
+ <sources>$(STC_SRC)</sources>
+ <msvc-headers>$(STC_HDR)</msvc-headers>
+ </lib>
+
+ <wxshortcut id="wxstc" cond="MONOLITHIC=='0' and USE_STC=='1'"/>
+
+ <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">stc=stclib+stcdll</set>
+
</makefile>