Don't use wx[H|V]SCROLL styles

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

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index befb3203847a3d20aefccf00ad789f21ced45273..3f0c11451d848c21fbf9b32c1c2dc69f74b0f36b 100644 (file)
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -11,20 +11,18 @@
          cond="SHARED=='1' and MONOLITHIC=='0'">
         <define>WXMAKINGDLL_BASE</define>
         <define>wxUSE_BASE=1</define>
-        <define>wxUSE_GUI=0</define> 
         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
         <msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
-        <msvc-copy-setup-h/>
     </dll>
     
     <lib id="baselib" template="wx_base_lib"
          cond="SHARED=='0' and MONOLITHIC=='0'">
         <define>wxUSE_BASE=1</define> 
-        <define>wxUSE_GUI=0</define> 
         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
         <msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
-        <msvc-copy-setup-h/>
     </lib>
+
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">base=baselib+basedll</set>
     
     
     <!-- ================================================================= -->
@@ -42,11 +40,11 @@
     
     <lib id="netlib" template="wx_base_lib"
          cond="SHARED=='0' and MONOLITHIC=='0'">
-        <define>WXUSINGDLL</define>
-        <define>WXMAKINGDLL_NET</define>
         <sources>$(NET_SRC)</sources>
-        <msvc-headers>$(NET_CMN_HDR)</msvc-headers>
+        <msvc-headers>$(NET_CMN_HDR) $(NET_PLATFORM_HDR)</msvc-headers>
     </lib>
+    
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">net=netlib+netdll</set>
 
     
     <!-- ================================================================= -->
@@ -70,6 +68,8 @@
         <msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers>
     </lib>
     
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">core=corelib+coredll</set>
+    
     
     <!-- ================================================================= -->
     <!--                     "Advanced" controls library                   -->
@@ -91,13 +91,15 @@
         <msvc-headers>$(ADVANCED_HDR)</msvc-headers>
     </lib>
     
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">adv=advlib+advdll</set>
+    
     
     <!-- ================================================================= -->
     <!--                        DB classes library                         -->
     <!-- ================================================================= -->
     
     <dll id="odbcdll" template="wx_base_dll"
-         cond="SHARED=='1' and USE_GUI=='1' and USE_ODBC=='1' and MONOLITHIC=='0'">
+         cond="SHARED=='1' and USE_ODBC=='1' and MONOLITHIC=='0'">
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_ODBC</define>
         <sources>$(ODBC_SRC)</sources>
@@ -107,7 +109,7 @@
     </dll>
     
     <lib id="odbclib" template="wx_base_lib"
-        cond="SHARED=='0' and USE_GUI=='1' and USE_ODBC=='1' and MONOLITHIC=='0'">
+        cond="SHARED=='0' and USE_ODBC=='1' and MONOLITHIC=='0'">
         <sources>$(ODBC_SRC)</sources>
         <msvc-headers>$(ODBC_HDR)</msvc-headers>
     </lib>
@@ -130,6 +132,9 @@
         <sources>$(DBGRID_SRC)</sources>
         <msvc-headers>$(DBGRID_HDR)</msvc-headers>
     </lib>
+    
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">odbc=odbclib+odbcdll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">dbgrid=dbgridlib+dbgriddll</set>
 
     
     <!-- ================================================================ -->
@@ -143,6 +148,7 @@
         <sources>$(HTML_SRC)</sources>
         <library>coredll</library>
         <library>basedll</library>
+        <ldlibs>$(EXTRALIBS_HTML)</ldlibs>
         <msvc-headers>$(HTML_HDR)</msvc-headers>
     </dll>
     
@@ -152,12 +158,16 @@
         <msvc-headers>$(HTML_HDR)</msvc-headers>
     </lib>
     
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">html=htmllib+htmldll</set>
+    
     <!-- ================================================================ -->
     <!--                             OpenGL                               -->
     <!-- ================================================================ -->
 
     <!-- included by wx.bkl from opengl.bkl -->
     
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">gl=gllib+gldll</set>
+    
     
     <!-- ================================================================ -->
     <!--                              XML                                 -->
@@ -178,5 +188,7 @@
         <sources>$(XML_SRC)</sources>
         <msvc-headers>$(XML_HDR)</msvc-headers>
     </lib>
+    
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">xml=xmllib+xmldll</set>
 
 </makefile>