diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-09-24 18:37:14 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-09-24 18:37:14 +0000 |
| commit | ae5736bfa41514eb7a9631bea4f5ae35aeebc9b4 (patch) | |
| tree | 5550cd5be2dd81387a611428168d9ff037544abc /auto/lib/zlib/makefile.msvc | |
| parent | ce750db2339d2971202dbc536d4a36b6f5acc86c (diff) | |
| download | nginx-ae5736bfa41514eb7a9631bea4f5ae35aeebc9b4.tar.gz nginx-ae5736bfa41514eb7a9631bea4f5ae35aeebc9b4.tar.bz2 | |
Merge of r4779, r4840, r4843, r4844: win32 changes.
*) Fixed build with Visual Studio 2005 Express.
It is available via winetricks which makes it still usable, and has
an old crtdefs.h which uses _CRT_SECURE_NO_DEPRECATE instead of
_CRT_SECURE_NO_WARNINGS to suppress warnings.
Reported by HAYASHI Kentaro,
http://mailman.nginx.org/pipermail/nginx-devel/2012-August/002542.html
*) Configure: provide inflate() when building zlib on win32.
*) Helper target "win32" to run configure for win32 builds.
*) Updated zlib used for win32 builds.
Diffstat (limited to 'auto/lib/zlib/makefile.msvc')
| -rw-r--r-- | auto/lib/zlib/makefile.msvc | 7 |
1 files changed, 5 insertions, 2 deletions
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 |