diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-09-11 12:35:30 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-09-11 12:35:30 +0000 |
| commit | 8522a2a707828e0739e4b3f4e00d3752e0472332 (patch) | |
| tree | 30dd9ed4d18bfec98ee44add3966f9919d0e779a | |
| parent | 4b948b49aa16e1990fb2e018b3da392caf602c36 (diff) | |
| download | nginx-8522a2a707828e0739e4b3f4e00d3752e0472332.tar.gz nginx-8522a2a707828e0739e4b3f4e00d3752e0472332.tar.bz2 | |
Configure: provide inflate() when building zlib on win32.
It is now needed for gunzip filter.
| -rw-r--r-- | auto/lib/zlib/makefile.bcc | 8 | ||||
| -rw-r--r-- | auto/lib/zlib/makefile.msvc | 7 | ||||
| -rw-r--r-- | auto/lib/zlib/makefile.owc | 4 |
3 files changed, 12 insertions, 7 deletions
diff --git a/auto/lib/zlib/makefile.bcc b/auto/lib/zlib/makefile.bcc index 56f835688..97a30ea39 100644 --- a/auto/lib/zlib/makefile.bcc +++ b/auto/lib/zlib/makefile.bcc @@ -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 diff --git a/auto/lib/zlib/makefile.msvc b/auto/lib/zlib/makefile.msvc index 2c7c1ae10..6fbd6918c 100644 --- a/auto/lib/zlib/makefile.msvc +++ b/auto/lib/zlib/makefile.msvc @@ -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 diff --git a/auto/lib/zlib/makefile.owc b/auto/lib/zlib/makefile.owc index f75e66d4f..9e123be83 100644 --- a/auto/lib/zlib/makefile.owc +++ b/auto/lib/zlib/makefile.owc @@ -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 |