X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c4728f63395c3641aa62f2b549ee693eb8be978..9f41fa227b8f3f0671d22216e2aa93c27840a597:/build/bakefiles/monolithic.bkl

diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl
index cd043384ac..4ff6ce415c 100644
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -3,7 +3,10 @@
 <makefile>
     
     <set var="MONOLIB_GUI_SRC">
-        <if cond="USE_GUI=='1'">$(CORE_SRC) $(HTML_SRC)</if>
+        <if cond="USE_GUI=='1'">
+            $(CORE_SRC) $(ADVANCED_SRC) $(HTML_SRC) $(ODBC_SRC) $(DBGRID_SRC)
+            $(XRC_SRC)
+        </if>
     </set>
     <set var="MONOLIB_SRC">
         $(BASE_SRC) $(BASE_AND_GUI_SRC) $(NET_SRC) $(MONOLIB_GUI_SRC) $(XML_SRC)
@@ -13,16 +16,24 @@
          cond="SHARED=='1' and MONOLITHIC=='1'">
         <define>wxUSE_BASE=1</define> 
         <define>WXMAKINGDLL</define>
-        <sources>$(MONOLIB_SRC)</sources>
-        <msvc-headers>$(ALL_HEADERS)</msvc-headers>
+        <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>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>