wx-config symlink creation fix

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

diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl
index 188e518d5d53011ca789e8466f9edb79984c1777..fe44e8df170875b6386bebcc993481009934ff64 100644 (file)
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -4,7 +4,7 @@
     
     <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)
+            $(CORE_SRC) $(ADVANCED_SRC) $(HTML_SRC) $(ODBC_SRC) $(DBGRID_SRC)

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


@@ -15,18 +15,24 @@
          cond="SHARED=='1' and MONOLITHIC=='1'">
         <define>wxUSE_BASE=1</define> 
         <define>WXMAKINGDLL</define>
          cond="SHARED=='1' and MONOLITHIC=='1'">
         <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_XML)</ldlibs>

+        <ldlibs>$(EXTRALIBS_HTML)</ldlibs>
+        <ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
+        <ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>

         <msvc-headers>$(ALL_HEADERS)</msvc-headers>
         <msvc-headers>$(ALL_HEADERS)</msvc-headers>

-        <msvc-copy-setup-h/>

     </dll>
     
     <lib id="monolib" template="wx_lib"
          cond="SHARED=='0' and MONOLITHIC=='1'">
         <define>wxUSE_BASE=1</define> 
     </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>
         <msvc-headers>$(ALL_HEADERS)</msvc-headers>

-        <msvc-copy-setup-h/>

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