X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ba28d9bbd591d9e793dce5bc8c31b151aecd66cb..daa66792aa4a108887d2b4e8078df6067b6a762f:/build/bakefiles/monolithic.bkl

diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl
index 02670d651c..9423b6e6d4 100644
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -1,25 +1,25 @@
 <?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)
+    </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>$(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>
     </dll>
     
     <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=1</define> 
+        <sources>$(MONOLIB_SRC)</sources>
     </lib>
 
 </makefile>