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 62143724b65469c9fa7186f89b25e92a54d54e91..9d0f043a5e5ad99c1c240fb9d3c39ba3375f0a96 100644 (file)
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -2,26 +2,23 @@
 <!-- $Id$ -->
 <makefile>
     
+    <set var="MONOLIB_GUI_SRC">
+        <if cond="USE_GUI=='1'">$(CORE_SRC) $(HTML_SRC)</if>
+    </set>
     <set var="MONOLIB_SRC">
-        <if cond="USE_GUI=='0'">
-            src/common/init.cpp $(BASE_SRC) $(BASE_AND_GUI_SRC)
-        </if>
-        <if cond="USE_GUI=='1'">
-            $(BASE_SRC) $(BASE_AND_GUI_SRC) $(CORE_SRC) $(HTML_SRC)
-        </if>
+        $(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>__WXBASE__</define> 
         <define>wxUSE_BASE=1</define> 
         <define>WXMAKINGDLL</define>
         <sources>$(MONOLIB_SRC)</sources>
+        <ldlibs>$(EXTRALIBS_XML)</ldlibs>
     </dll>
     
     <lib id="monolib" template="wx_lib"
          cond="SHARED=='0' and MONOLITHIC=='1'">
-        <define>__WXBASE__</define> 
         <define>wxUSE_BASE=1</define> 
         <sources>$(MONOLIB_SRC)</sources>
     </lib>