no real change, removed commented out code forgotten there

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

diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl
index 294c92921aee38bedd5596aff7906e221e972515..2880c8e2f4eb9962bf2470ae2b65748135f7633e 100644 (file)
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -2,26 +2,32 @@
 <!-- $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'">
-            $(BASE_SRC) $(BASE_AND_GUI_SRC) $(CORE_SRC) $(HTML_SRC)
+            $(CORE_SRC) $(ADVANCED_SRC) $(HTML_SRC) $(ODBC_SRC) $(DBGRID_SRC)
         </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'">
         <define>wxUSE_BASE=1</define> 
         <define>WXMAKINGDLL</define>
         <sources>$(MONOLIB_SRC)</sources>
+        <ldlibs>$(EXTRALIBS_XML)</ldlibs>
+        <ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
+        <msvc-headers>$(ALL_HEADERS)</msvc-headers>
+        <msvc-copy-setup-h/>
     </dll>
     
     <lib id="monolib" template="wx_lib"
          cond="SHARED=='0' and MONOLITHIC=='1'">
         <define>wxUSE_BASE=1</define> 
         <sources>$(MONOLIB_SRC)</sources>
+        <msvc-headers>$(ALL_HEADERS)</msvc-headers>
+        <msvc-copy-setup-h/>
     </lib>
 
 </makefile>