X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/468375fe6996f57227b6904ecc6a685b53018312..df135587addaaa316f7ab4606815086ef133e846:/build/bakefiles/monolithic.bkl?ds=sidebyside

diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl
index 62143724b6..fe44e8df17 100644
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -2,28 +2,37 @@
 <!-- $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>__WXBASE__</define> 
         <define>wxUSE_BASE=1</define> 
         <define>WXMAKINGDLL</define>
-        <sources>$(MONOLIB_SRC)</sources>
+        <sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
+        <ldlibs>$(EXTRALIBS_XML)</ldlibs>
+        <ldlibs>$(EXTRALIBS_HTML)</ldlibs>
+        <ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
+        <ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
+        <msvc-headers>$(ALL_HEADERS)</msvc-headers>
     </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>
+        <sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
+        <msvc-headers>$(ALL_HEADERS)</msvc-headers>
     </lib>
+    
+    
+    <set var="MSVC6PRJ_MERGED_TARGETS_MONOLIB" append="1">mono=monolib+monodll</set>
+    <!-- included by wx.bkl from opengl.bkl -->
+    <set var="MSVC6PRJ_MERGED_TARGETS_MONOLIB" append="1">gl=gllib+gldll</set>
 
 </makefile>