added wxGzipIOStreams (patch 792932)

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

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index 17c8c3fa8f4ef5cadb61d80e2c08bf906fafd320..2b8881e559e79eb73c479b6ecc9dcd3087c82561 100644 (file)
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -13,7 +13,6 @@
         <define>wxUSE_BASE=1</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"
@@ -21,7 +20,6 @@
         <define>wxUSE_BASE=1</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>
@@ -43,7 +41,7 @@
     <lib id="netlib" template="wx_base_lib"
          cond="SHARED=='0' and MONOLITHIC=='0'">
         <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>
@@ -101,7 +99,7 @@
     <!-- ================================================================= -->
     
     <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>
@@ -111,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>