X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c79241a238663d524ba4b9b63bcf9952f3d58609..ec80cb6ec15dab42845b760e555878d4ba2113c4:/build/bakefiles/monolithic.bkl

diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl
index a5ea3ae4cd..80b4a74f66 100644
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -1,10 +1,11 @@
 <?xml version="1.0" ?>
 <!-- $Id$ -->
 <makefile>
-    
+
     <set var="MONOLIB_GUI_SRC">
         <if cond="USE_GUI=='1'">
-            $(CORE_SRC) $(ADVANCED_SRC) $(HTML_SRC) $(ODBC_SRC) $(DBGRID_SRC)
+            $(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(ODBC_SRC) $(QA_SRC)
+            $(DBGRID_SRC) $(XRC_SRC) $(AUI_SRC) $(RICHTEXT_SRC)
         </if>
     </set>
     <set var="MONOLIB_SRC">
@@ -13,7 +14,7 @@
 
     <dll id="monodll" template="wx_dll"
          cond="SHARED=='1' and MONOLITHIC=='1'">
-        <define>wxUSE_BASE=1</define> 
+        <define>wxUSE_BASE=1</define>
         <define>WXMAKINGDLL</define>
         <sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
         <ldlibs>$(EXTRALIBS_XML)</ldlibs>
@@ -22,12 +23,20 @@
         <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> 
+        <define>wxUSE_BASE=1</define>
         <sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
         <msvc-headers>$(ALL_HEADERS)</msvc-headers>
+        <if cond="FORMAT=='watcom'">
+            <set var="LIB_PAGESIZE" overwrite="1">8192</set>
+        </if>
     </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>