]> git.kaiwu.me - nginx.git/commitdiff
Configure: provide inflate() when building zlib on win32.
authorMaxim Dounin <mdounin@mdounin.ru>
Tue, 11 Sep 2012 12:35:30 +0000 (12:35 +0000)
committerMaxim Dounin <mdounin@mdounin.ru>
Tue, 11 Sep 2012 12:35:30 +0000 (12:35 +0000)
It is now needed for gunzip filter.

auto/lib/zlib/makefile.bcc
auto/lib/zlib/makefile.msvc
auto/lib/zlib/makefile.owc

index 56f8356884e28c19caa04c576a79b76f5f9f2842..97a30ea3951fcf225eb18175f978cbbde85b536f 100644 (file)
@@ -8,8 +8,10 @@ CFLAGS = -q -O2 -tWM -w-8004 -w-8012 $(CPU_OPT)
 zlib.lib:
        cd $(ZLIB)
 
-       bcc32 -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c \
-               compress.c
+       bcc32 -c $(CFLAGS) adler32.c crc32.c deflate.c \
+               trees.c zutil.c compress.c \
+               inflate.c inffast.c inftrees.c
 
        tlib zlib.lib +adler32.obj +crc32.obj +deflate.obj \
-               +trees.obj +zutil.obj +compress.obj
+               +trees.obj +zutil.obj +compress.obj \
+               +inflate.obj +inffast.obj +inftrees.obj
index 2c7c1ae1025cb43959f77ad7a92b2bae4791b4c6..6fbd6918c2fba515678a6ce3d6763704c42d3726 100644 (file)
@@ -8,7 +8,10 @@ CFLAGS = -nologo -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT)
 zlib.lib:
        cd $(ZLIB)
 
-       cl -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c compress.c
+       cl -c $(CFLAGS) adler32.c crc32.c deflate.c \
+               trees.c zutil.c compress.c \
+               inflate.c inffast.c inftrees.c
 
        link -lib -out:zlib.lib adler32.obj crc32.obj deflate.obj \
-               trees.obj zutil.obj compress.obj
+               trees.obj zutil.obj compress.obj \
+               inflate.obj inffast.obj inftrees.obj
index f75e66d4f5bdb6fb906f7dc22c0f96aae42ce8ae..9e123be83e9c14bb4d75000d8e0bba0be039f72d 100644 (file)
@@ -9,6 +9,6 @@ zlib.lib:
        cd $(ZLIB)
 
        wcl386 -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c &
-               compress.c
+               compress.c inflate.c inffast.c inftrees.c
        wlib -n zlib.lib adler32.obj crc32.obj deflate.obj trees.obj &
-               zutil.obj compress.obj
+               zutil.obj compress.obj inflate.obj inffast.obj inftrees.obj