fixed inclusion of expat include dir

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

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index 4f4422bfad11709afebe72f7e47f8fdee5406dae..2222ab8f73a94146401532fd3817601e9ea6e41d 100644 (file)
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -7,7 +7,7 @@
     <!--                            wxBase library                         -->
     <!-- ================================================================= -->
     
     <!--                            wxBase library                         -->
     <!-- ================================================================= -->
     

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

          cond="SHARED=='1' and MONOLITHIC=='0'">
         <define>WXMAKINGDLL_BASE</define>
         <define>wxUSE_BASE=1</define>
          cond="SHARED=='1' and MONOLITHIC=='0'">
         <define>WXMAKINGDLL_BASE</define>
         <define>wxUSE_BASE=1</define>


@@ -15,7 +15,7 @@
         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
     </dll>
     
         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
     </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> 
          cond="SHARED=='0' and MONOLITHIC=='0'">
         <define>wxUSE_BASE=1</define> 
         <define>wxUSE_GUI=0</define> 


@@ -47,7 +47,7 @@
     <!-- ================================================================ -->
     
     <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>
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_HTML</define>
         <sources>$(HTML_SRC)</sources>


@@ -56,8 +56,33 @@
     </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>
     </lib>
         <sources>$(HTML_SRC)</sources>
     </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>
+        <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>
+    </lib>

 
 </makefile>
 
 </makefile>