fixed inclusion of expat include dir

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

diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl
index 9efa30ec9694e33ba9442985ffa17d0234256aea..9d0f043a5e5ad99c1c240fb9d3c39ba3375f0a96 100644 (file)
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -1,22 +1,26 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->
 <makefile>
+    
+    <set var="MONOLIB_GUI_SRC">
+        <if cond="USE_GUI=='1'">$(CORE_SRC) $(HTML_SRC)</if>
+    </set>
+    <set var="MONOLIB_SRC">
+        $(BASE_SRC) $(BASE_AND_GUI_SRC) $(MONOLIB_GUI_SRC) $(XML_SRC)
+    </set>
 
     <dll id="monodll" template="wx_dll"
          cond="SHARED=='1' and MONOLITHIC=='1'">
+        <define>wxUSE_BASE=1</define> 
         <define>WXMAKINGDLL</define>
-        <sources>$(BASE_SRC) $(CORE_SRC) $(HTML_SRC)</sources>
-      
-        <library>$(LIB_ZLIB)</library>
-        <library>$(LIB_REGEX)</library>
-        <library>$(LIB_PNG)</library>
-        <library>$(LIB_JPEG)</library>
-        <library>$(LIB_TIFF)</library>
-        <library>$(LIB_ODBC)</library>
+        <sources>$(MONOLIB_SRC)</sources>
+        <ldlibs>$(EXTRALIBS_XML)</ldlibs>
     </dll>
     
     <lib id="monolib" template="wx_lib"
          cond="SHARED=='0' and MONOLITHIC=='1'">
-        <sources>$(BASE_SRC) $(CORE_SRC) $(HTML_SRC)</sources>
+        <define>wxUSE_BASE=1</define> 
+        <sources>$(MONOLIB_SRC)</sources>
     </lib>
 
 </makefile>