X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6fd9f0a47401cb921400f5b7ad43da8010ab170f..0ca4ab85b71e0063ff7d323b77c940219446f7fb:/build/bakefiles/multilib.bkl

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index d661d44421..47e4820737 100644
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -1,42 +1,71 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->
+
 <makefile>
     
     <!-- ================================================================= -->
     <!--                            wxBase library                         -->
     <!-- ================================================================= -->
     
-    <dll id="basedll" template="wx_dll"
+    <dll id="basedll" template="wx_base_dll"
          cond="SHARED=='1' and MONOLITHIC=='0'">
-        <define>WXMAKINGDLL</define>
+        <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_lib"
+    <lib id="baselib" template="wx_base_lib"
          cond="SHARED=='0' and MONOLITHIC=='0'">
         <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>
+    </lib>
+    
+    
+    <!-- ================================================================= -->
+    <!--                             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'">
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_NET</define>
+        <sources>$(NET_SRC)</sources>
+        <msvc-headers>$(NET_CMN_HDR)</msvc-headers>
     </lib>
 
+    
     <!-- ================================================================= -->
     <!--                           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>
-        
-        <wx-lib>base</wx-lib>
+        <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> 
         <sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
+        <msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers>
     </lib>
 
     
@@ -45,16 +74,46 @@
     <!-- ================================================================ -->
     
     <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>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
+        <library>coredll</library>
+        <library>basedll</library>
+        <msvc-headers>$(HTML_HDR)</msvc-headers>
     </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>
+        <msvc-headers>$(HTML_HDR)</msvc-headers>
+    </lib>
+    
+    <!-- ================================================================ -->
+    <!--                             OpenGL                               -->
+    <!-- ================================================================ -->
+
+    <!-- included by wx.bkl from opengl.bkl -->
+    
+    
+    <!-- ================================================================ -->
+    <!--                              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>
 
 </makefile>