Enable using jom in place of nmake in the wxMSW build

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

diff --git a/build/bakefiles/zlib.bkl b/build/bakefiles/zlib.bkl
index 10c977605feab6ba9d5feb5f013102c13eaa736b..2028607e8856e25f0125266edeab68d11d6988f1 100644 (file)
--- a/build/bakefiles/zlib.bkl
+++ b/build/bakefiles/zlib.bkl
@@ -3,20 +3,33 @@
 
     <if cond="FORMAT=='autoconf'">
         <option name="wxUSE_ZLIB"/>
 
     <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>
     </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>
     </if>

-    <set var="LIB_ZLIB">
-        <if cond="wxUSE_ZLIB=='builtin'">wxzlib$(WXDEBUGFLAG)</if>
-    </set>

     <set var="INC_ZLIB">
     <set var="INC_ZLIB">

-        <if cond="wxUSE_ZLIB=='builtin'">$(TOP_SRCDIR)/src/zlib</if>
+        <if cond="wxUSE_ZLIB=='builtin'">$(TOP_SRCDIR)src/zlib</if>

     </set>
 
     <lib id="wxzlib" template="3rdparty_lib"
          cond="wxUSE_ZLIB=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
     </set>
 
     <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
         <sources>
             src/zlib/adler32.c
             src/zlib/compress.c


@@ -27,10 +40,8 @@
             src/zlib/trees.c
             src/zlib/zutil.c
             src/zlib/inflate.c
             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/inftrees.c

-            src/zlib/infcodes.c
-            src/zlib/infutil.c

             src/zlib/inffast.c
         </sources>
     </lib>
             src/zlib/inffast.c
         </sources>
     </lib>