added precomp-headers-exclude (DSP files only so far) and fixed dependencies for...

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

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index a977678950bd42bfdc72b5e5368ee0798fdca7a4..cbb21d4b6d8825015f6f6ce772b22f789dbcd49a 100644 (file)
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -1,24 +1,27 @@
 <?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>WXUSINGDLL</define>

         <define>WXMAKINGDLL_BASE</define>
         <define>wxUSE_BASE=1</define>
         <define>wxUSE_GUI=0</define> 
         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
         <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>
     
     </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>
          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>
 
     <!-- ================================================================= -->
     </lib>
 
     <!-- ================================================================= -->


@@ -31,6 +34,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>
     


@@ -38,6 +42,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>
 
     


@@ -46,17 +51,46 @@
     <!-- ================================================================ -->
     
     <dll id="htmldll" template="wx_dll"
     <!-- ================================================================ -->
     
     <dll id="htmldll" template="wx_dll"

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

         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_HTML</define>
         <sources>$(HTML_SRC)</sources>
         <library>coredll</library>
         <library>basedll</library>
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_HTML</define>
         <sources>$(HTML_SRC)</sources>
         <library>coredll</library>
         <library>basedll</library>

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