added wxGzipIOStreams (patch 792932)

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

diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl
index 434d4b9a2b1abce9335e23238477c1dbab9d24bc..d67fed5f40d55820f79dd5c2b68a50e2596bb5b7 100644 (file)
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -2,35 +2,30 @@
 <!-- $Id$ -->
 <makefile>
     
 <!-- $Id$ -->
 <makefile>
     

-    <set var="MONOLIB_SRC">
-        <if cond="USE_GUI=='0'">
-            src/common/init.cpp $(BASE_SRC) $(BASE_AND_GUI_SRC)
-        </if>
+    <set var="MONOLIB_GUI_SRC">

         <if cond="USE_GUI=='1'">
         <if cond="USE_GUI=='1'">

-            $(BASE_SRC) $(BASE_AND_GUI_SRC) $(CORE_SRC) $(HTML_SRC)
+            $(CORE_SRC) $(ADVANCED_SRC) $(HTML_SRC) $(ODBC_SRC) $(DBGRID_SRC)

         </if>
     </set>
         </if>
     </set>

+    <set var="MONOLIB_SRC">
+        $(BASE_SRC) $(BASE_AND_GUI_SRC) $(NET_SRC) $(MONOLIB_GUI_SRC) $(XML_SRC)
+    </set>

 
     <dll id="monodll" template="wx_dll"
          cond="SHARED=='1' and MONOLITHIC=='1'">
 
     <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>
         <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>
+        <ldlibs>$(EXTRALIBS_XML)</ldlibs>
+        <ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
+        <msvc-headers>$(ALL_HEADERS)</msvc-headers>

     </dll>
     
     <lib id="monolib" template="wx_lib"
          cond="SHARED=='0' and MONOLITHIC=='1'">
     </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>
         <define>wxUSE_BASE=1</define> 
         <sources>$(MONOLIB_SRC)</sources>

+        <msvc-headers>$(ALL_HEADERS)</msvc-headers>

     </lib>
 
 </makefile>
     </lib>
 
 </makefile>