Added script to bake everthing (OK, so it's trivial...)

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

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index bb6dd8c2e4ecdee99f90722b2f9b8194950bbe55..9f1a033d26be4d4dab906582b0e0065c3fef6edd 100644 (file)
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -1,51 +1,141 @@
 <?xml version="1.0" ?>
 <?xml version="1.0" ?>

+<!-- $Id$ -->
+

 <makefile>
     
     <!-- ================================================================= -->
     <!--                            wxBase library                         -->
     <!-- ================================================================= -->
     
 <makefile>
     
     <!-- ================================================================= -->
     <!--                            wxBase library                         -->
     <!-- ================================================================= -->
     

-    <dll id="basedll" template="wx_dll"
+    <dll id="basedll" template="wx_base_dll"

          cond="SHARED=='1' and MONOLITHIC=='0'">
          cond="SHARED=='1' and MONOLITHIC=='0'">

-        <define>WXMAKINGDLL</define>
-        <define>__WXBASE__</define> 
+        <define>WXMAKINGDLL_BASE</define>

         <define>wxUSE_BASE=1</define>
         <define>wxUSE_BASE=1</define>

-        <define>wxUSE_GUI=0</define> 

         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>

-        
-        <library>$(LIB_ZLIB)</library>
-        <library>$(LIB_REGEX)</library>
-        <library>$(LIB_PNG)</library>
-        <library>$(LIB_JPEG)</library>
-        <library>$(LIB_TIFF)</library>
+        <msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>

     </dll>
     
     </dll>
     

-    <lib id="baselib" template="wx_lib"
+    <lib id="baselib" template="wx_base_lib"

          cond="SHARED=='0' and MONOLITHIC=='0'">
          cond="SHARED=='0' and MONOLITHIC=='0'">

-        <define>__WXBASE__</define> 

         <define>wxUSE_BASE=1</define> 
         <define>wxUSE_BASE=1</define> 

-        <define>wxUSE_GUI=0</define> 

         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>

+        <msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>

     </lib>
 
     </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'">
     <!-- ================================================================= -->
     <!--                           Main GUI library                        -->
     <!-- ================================================================= -->
     
     <dll id="coredll" template="wx_dll"
          cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">

-        <define>WXMAKINGDLL</define>
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_CORE</define>
+        <define>wxUSE_BASE=0</define> 

         <sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
         <sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>

-        
-        <wx-lib>base</wx-lib>
-      
-        <library>$(LIB_ODBC)</library>        
+        <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'">
     </dll>
     
     <lib id="corelib" template="wx_lib"
          cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">

+        <define>wxUSE_BASE=0</define> 

         <sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
         <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>
+    
+    
+    <!-- ================================================================= -->
+    <!--                        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>
     </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>

 
     
     <!-- ================================================================ -->
 
     
     <!-- ================================================================ -->


@@ -53,16 +143,78 @@
     <!-- ================================================================ -->
     
     <dll id="htmldll" template="wx_dll"
     <!-- ================================================================ -->
     
     <dll id="htmldll" template="wx_dll"

-         cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
-        <define>WXMAKINGDLL</define>
+         cond="SHARED=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_HTML</define>

         <sources>$(HTML_SRC)</sources>
         <sources>$(HTML_SRC)</sources>

-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
+        <library>coredll</library>
+        <library>basedll</library>
+        <ldlibs>$(EXTRALIBS_HTML)</ldlibs>
+        <msvc-headers>$(HTML_HDR)</msvc-headers>

     </dll>
     
     <lib id="htmllib" template="wx_lib"
     </dll>
     
     <lib id="htmllib" template="wx_lib"

-         cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
+         cond="SHARED=='0' and USE_HTML=='1' and MONOLITHIC=='0'">

         <sources>$(HTML_SRC)</sources>
         <sources>$(HTML_SRC)</sources>

+        <msvc-headers>$(HTML_HDR)</msvc-headers>

     </lib>
     </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>
+    
+    
+    <!-- ================================================================ -->
+    <!--                              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>
 </makefile>