wxBase fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl
index 02670d651c448deb6fd361d6f1da52287342da90..100c5faca81b688e92a2457546ebf6935e019e39 100644 (file)
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -1,12 +1,21 @@
 <?xml version="1.0" ?>
 <!-- $Id$ -->
 <makefile>
+    
+    <set var="MONOLIB_SRC">
+        <if cond="USE_GUI=='0'">
+            src/common/init.cpp $(BASE_SRC)
+        </if>
+        <if cond="USE_GUI=='1'">
+            $(BASE_SRC) $(CORE_SRC) $(HTML_SRC)
+        </if>
+    </set>
 
     <dll id="monodll" template="wx_dll"
          cond="SHARED=='1' and MONOLITHIC=='1'">
-        <define>__WXBASE__</define> 
+        <define>wxUSE_BASE</define> 
         <define>WXMAKINGDLL</define>
-        <sources>$(BASE_SRC) $(CORE_SRC) $(HTML_SRC)</sources>
+        <sources>$(MONOLIB_SRC)</sources>
       
         <library>$(LIB_ZLIB)</library>
         <library>$(LIB_REGEX)</library>
@@ -18,8 +27,8 @@
     
     <lib id="monolib" template="wx_lib"
          cond="SHARED=='0' and MONOLITHIC=='1'">
-        <define>__WXBASE__</define> 
-        <sources>$(BASE_SRC) $(CORE_SRC) $(HTML_SRC)</sources>
+        <define>wxUSE_BASE</define> 
+        <sources>$(MONOLIB_SRC)</sources>
     </lib>
 
 </makefile>