X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/698ec182729bd330dabda6bc126ba828029ab5c3..65751a0ee7a4cfaef9f459c29bfd67f5be6d893b:/build/bakefiles/zlib.bkl diff --git a/build/bakefiles/zlib.bkl b/build/bakefiles/zlib.bkl index 4a1ce03797..2028607e88 100644 --- a/build/bakefiles/zlib.bkl +++ b/build/bakefiles/zlib.bkl @@ -3,13 +3,20 @@ <if cond="FORMAT=='autoconf'"> <option name="wxUSE_ZLIB"/> + <set var="LIB_ZLIB"> + <if cond="wxUSE_ZLIB=='builtin'"> + wxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) + </if> + </set> </if> <if cond="FORMAT!='autoconf'"> <set var="wxUSE_ZLIB">builtin</set> + <set var="LIB_ZLIB"> + <if cond="wxUSE_ZLIB=='builtin'"> + wxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) + </if> + </set> </if> - <set var="LIB_ZLIB"> - <if cond="wxUSE_ZLIB=='builtin'">wxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)</if> - </set> <set var="INC_ZLIB"> <if cond="wxUSE_ZLIB=='builtin'">$(TOP_SRCDIR)src/zlib</if> </set> @@ -17,7 +24,12 @@ <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> + <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 @@ -28,10 +40,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>