changed to behave in same way as native win32 control and generic wxListCtrl when...

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

diff --git a/build/bakefiles/zlib.bkl b/build/bakefiles/zlib.bkl
index 21c75be96cf2c65d74b24a5c39990ab74b25f9a1..73850d936a8b1530e4039761689402d3cb296430 100644 (file)
--- a/build/bakefiles/zlib.bkl
+++ b/build/bakefiles/zlib.bkl
@@ -8,15 +8,21 @@
         <set var="wxUSE_ZLIB">builtin</set>
     </if>
     <set var="LIB_ZLIB">
-        <if cond="wxUSE_ZLIB=='builtin'">wxzlib</if>
+        <if cond="wxUSE_ZLIB=='builtin'">wxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
     </set>
     <set var="INC_ZLIB">
-        <if cond="wxUSE_ZLIB=='builtin'">$(SRCDIR)/src/zlib</if>
+        <if cond="wxUSE_ZLIB=='builtin'">$(TOP_SRCDIR)src/zlib</if>
     </set>
 
-    <lib id="wxzlib" teplate="3rdparty_lib"
+    <lib id="wxzlib" template="3rdparty_lib"
          cond="wxUSE_ZLIB=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
+        <cflags-borland>
+            -w-8004 -w-8008 -w-8012 -w-8057 -w-8066
+        </cflags-borland> 
+        <if cond="FORMAT=='msevc4prj'">
+            <define>NO_ERRNO_H</define>
+        </if>
         <sources>
             src/zlib/adler32.c
             src/zlib/compress.c
@@ -27,10 +33,8 @@
             src/zlib/trees.c
             src/zlib/zutil.c
             src/zlib/inflate.c
-            src/zlib/infblock.c
+            src/zlib/infback.c
             src/zlib/inftrees.c
-            src/zlib/infcodes.c
-            src/zlib/infutil.c
             src/zlib/inffast.c
         </sources>
     </lib>