Added wxRenderer method for drawing selection

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

diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl
index 02670d651c448deb6fd361d6f1da52287342da90..a41b78697babbc8aa411b83c5c862302208e7854 100644 (file)
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -2,24 +2,38 @@
 <!-- $Id$ -->
 <makefile>
 
 <!-- $Id$ -->
 <makefile>
 

+    <set var="MONOLIB_GUI_SRC">
+        <if cond="USE_GUI=='1'">
+            $(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(ODBC_SRC) $(QA_SRC)
+            $(DBGRID_SRC) $(XRC_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'">
     <dll id="monodll" template="wx_dll"
          cond="SHARED=='1' and MONOLITHIC=='1'">

-        <define>__WXBASE__</define> 
+        <define>wxUSE_BASE=1</define>

         <define>WXMAKINGDLL</define>
         <define>WXMAKINGDLL</define>

-        <sources>$(BASE_SRC) $(CORE_SRC) $(HTML_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>
+        <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>
     </dll>

-    
+

     <lib id="monolib" template="wx_lib"
          cond="SHARED=='0' and MONOLITHIC=='1'">
     <lib id="monolib" template="wx_lib"
          cond="SHARED=='0' and MONOLITHIC=='1'">

-        <define>__WXBASE__</define> 
-        <sources>$(BASE_SRC) $(CORE_SRC) $(HTML_SRC)</sources>
+        <define>wxUSE_BASE=1</define>
+        <sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
+        <msvc-headers>$(ALL_HEADERS)</msvc-headers>

     </lib>
 
     </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>
 </makefile>