wxUSE_STL compilation fixes for wxGenericFontDialog

[wxWidgets.git] / build / bakefiles / multilib.bkl

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index cba2e42cfbdea723b7bdc230edd5bb7f06ad07ca..0d57ebdbfe7cfedf8542c95d8d69696cb9ba223c 100644 (file)
--- 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>
 
 
@@ -115,6 +137,8 @@
         <msvc-headers>$(MEDIA_HDR)</msvc-headers>
     </lib>
 
+    <wxshortcut id="wxmedia" cond="MONOLITHIC=='0' and USE_GUI=='1' and USE_MEDIA=='1'"/>
+
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">media=medialib+mediadll</set>
 
 
@@ -138,7 +162,6 @@
         <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>
@@ -157,6 +180,9 @@
         <msvc-headers>$(DBGRID_HDR)</msvc-headers>
     </lib>
 
+    <!-- <wxshortcut id="wxodbc" cond="MONOLITHIC=='0' and USE_ODBC=='1'"/> -->
+    <wxshortcut id="wxdbgrid" cond="MONOLITHIC=='0' and USE_GUI=='1' and USE_ODBC=='1'"/>
+
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">odbc=odbclib+odbcdll</set>
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">dbgrid=dbgridlib+dbgriddll</set>
 
@@ -176,12 +202,19 @@
         <msvc-headers>$(HTML_HDR)</msvc-headers>
     </dll>
 
+    <!-- use this to conditonally link against htmldll with <library>: -->
+    <set var="htmldll_library_link">
+        <if cond="SHARED=='1' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">htmldll</if>
+    </set>
+
     <lib id="htmllib" template="wx_lib"
          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>
 
+    <wxshortcut id="wxhtml" cond="MONOLITHIC=='0' and USE_HTML=='1'"/>
+
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">html=htmllib+htmldll</set>
 
     <!-- ================================================================ -->
@@ -214,6 +247,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>
 
     <!-- ================================================================ -->
@@ -236,6 +271,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>
 
     <!-- ================================================================ -->
@@ -247,7 +284,7 @@
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_XRC</define>
         <sources>$(XRC_SRC)</sources>
-        <library>htmldll</library>
+        <library>$(htmldll_library_link)</library>
         <library>advdll</library>
         <library>coredll</library>
         <library>xmldll</library>
@@ -261,6 +298,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>
 
     <!-- ================================================================ -->
@@ -283,6 +322,8 @@
         <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>
 
@@ -296,7 +337,7 @@
         <define>WXMAKINGDLL_RICHTEXT</define>
         <sources>$(RICHTEXT_SRC)</sources>
         <library>advdll</library>
-        <library>htmldll</library>
+        <library>$(htmldll_library_link)</library>
         <library>xmldll</library>
         <library>coredll</library>
         <library>basedll</library>
@@ -308,7 +349,43 @@
         <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">
+        <include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
+        <include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
+        <define>__WX__</define>
+        <define>SCI_LEXER</define>
+        <define>LINK_LEXERS</define>
+        <cppflags-borland>-w-8027</cppflags-borland>
+        <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>