Patches from "Viktor Voroshylo" <viktor@voroshylo.com>

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

diff --git a/build/bakefiles/zlib.bkl b/build/bakefiles/zlib.bkl
index 18020fa730112ef4545387b64e634b07abc98b42..4a1ce037977fc8edc12ac47d6544605d169b6378 100644 (file)
--- a/build/bakefiles/zlib.bkl
+++ b/build/bakefiles/zlib.bkl
@@ -8,15 +8,16 @@
         <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="anylib"
+    <lib id="wxzlib" template="3rdparty_lib"
          cond="wxUSE_ZLIB=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
+        <cflags-borland>-w-8004 -w-8012 -w-8057</cflags-borland> 
         <sources>
             src/zlib/adler32.c
             src/zlib/compress.c