X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6ae02da411044f33d1d25dfd89bff2d1cffd7e32..cea4cc794274ae3dcd20133f009d74eaaa7d1c1e:/build/bakefiles/monolithic.bkl?ds=sidebyside

diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl
index 100c5faca8..9423b6e6d4 100644
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -2,32 +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)
-        </if>
-        <if cond="USE_GUI=='1'">
-            $(BASE_SRC) $(CORE_SRC) $(HTML_SRC)
-        </if>
+        $(BASE_SRC) $(BASE_AND_GUI_SRC) $(MONOLIB_GUI_SRC)
     </set>
 
     <dll id="monodll" template="wx_dll"
          cond="SHARED=='1' and MONOLITHIC=='1'">
-        <define>wxUSE_BASE</define> 
+        <define>wxUSE_BASE=1</define> 
         <define>WXMAKINGDLL</define>
         <sources>$(MONOLIB_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>
     </dll>
     
     <lib id="monolib" template="wx_lib"
          cond="SHARED=='0' and MONOLITHIC=='1'">
-        <define>wxUSE_BASE</define> 
+        <define>wxUSE_BASE=1</define> 
         <sources>$(MONOLIB_SRC)</sources>
     </lib>