wxCocoa: Added clipbrd.(mm|h) dataobj.(mm|h) dataform.h dataobj2.h

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

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index 4ce1dd689620b177aa67396b4df3ab541c30dd16..47e48207378881b95408aa21155202c8e7169e60 100644 (file)
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -13,6 +13,7 @@
         <define>wxUSE_BASE=1</define>
         <define>wxUSE_GUI=0</define> 
         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
         <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"
     </dll>
     
     <lib id="baselib" template="wx_base_lib"


@@ -20,8 +21,32 @@
         <define>wxUSE_BASE=1</define> 
         <define>wxUSE_GUI=0</define> 
         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
         <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>
 
     </lib>
 

+    

     <!-- ================================================================= -->
     <!--                           Main GUI library                        -->
     <!-- ================================================================= -->
     <!-- ================================================================= -->
     <!--                           Main GUI library                        -->
     <!-- ================================================================= -->


@@ -32,6 +57,7 @@
         <define>WXMAKINGDLL_CORE</define>
         <define>wxUSE_BASE=0</define> 
         <sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
         <define>WXMAKINGDLL_CORE</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>
     
         <library>basedll</library>
     </dll>
     


@@ -39,6 +65,7 @@
          cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
         <define>wxUSE_BASE=0</define> 
         <sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
          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>
 
     
     </lib>
 
     


@@ -53,11 +80,13 @@
         <sources>$(HTML_SRC)</sources>
         <library>coredll</library>
         <library>basedll</library>
         <sources>$(HTML_SRC)</sources>
         <library>coredll</library>
         <library>basedll</library>

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

     </dll>
     
     <lib id="htmllib" template="wx_lib"
          cond="SHARED=='0' and USE_HTML=='1' and MONOLITHIC=='0'">
         <sources>$(HTML_SRC)</sources>
     </dll>
     
     <lib id="htmllib" template="wx_lib"
          cond="SHARED=='0' and USE_HTML=='1' and MONOLITHIC=='0'">
         <sources>$(HTML_SRC)</sources>

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

     </lib>
     
     <!-- ================================================================ -->
     </lib>
     
     <!-- ================================================================ -->


@@ -65,5 +94,26 @@
     <!-- ================================================================ -->
 
     <!-- included by wx.bkl from opengl.bkl -->
     <!-- ================================================================ -->
 
     <!-- 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>
 
 </makefile>