Rebake after adding libs html and xml to samples using lib adv

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

diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl
index a5ea3ae4cdd08269ebc67c33a6061cfa01630356..a41b78697babbc8aa411b83c5c862302208e7854 100644 (file)
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -1,10 +1,11 @@
 <?xml version="1.0" ?>
 <!-- $Id$ -->
 <makefile>
 <?xml version="1.0" ?>
 <!-- $Id$ -->
 <makefile>

-    
+

     <set var="MONOLIB_GUI_SRC">
         <if cond="USE_GUI=='1'">
     <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)

         </if>
     </set>
     <set var="MONOLIB_SRC">
         </if>
     </set>
     <set var="MONOLIB_SRC">


@@ -13,7 +14,7 @@
 
     <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>wxUSE_BASE=1</define> 
+        <define>wxUSE_BASE=1</define>

         <define>WXMAKINGDLL</define>
         <sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
         <ldlibs>$(EXTRALIBS_XML)</ldlibs>
         <define>WXMAKINGDLL</define>
         <sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
         <ldlibs>$(EXTRALIBS_XML)</ldlibs>


@@ -22,12 +23,17 @@
         <ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
         <msvc-headers>$(ALL_HEADERS)</msvc-headers>
     </dll>
         <ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
         <msvc-headers>$(ALL_HEADERS)</msvc-headers>
     </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>wxUSE_BASE=1</define> 
+        <define>wxUSE_BASE=1</define>

         <sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
         <msvc-headers>$(ALL_HEADERS)</msvc-headers>
     </lib>
 
         <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>
 </makefile>