diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-03-10 17:55:19 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-03-10 17:55:19 +0000 |
| commit | 24b56c92bb344a5377f02eda85c639f86a8592ff (patch) | |
| tree | ba4494ec3463e67f261ec58e81e68963cdda1b2f /auto/lib/zlib | |
| parent | fc5a10aedcdd8cf261ecc164941562bc52fe415d (diff) | |
| download | nginx-24b56c92bb344a5377f02eda85c639f86a8592ff.tar.gz nginx-24b56c92bb344a5377f02eda85c639f86a8592ff.tar.bz2 | |
nginx-0.0.2-2004-03-10-20:55:19 import
Diffstat (limited to 'auto/lib/zlib')
| -rw-r--r-- | auto/lib/zlib/make | 4 | ||||
| -rw-r--r-- | auto/lib/zlib/makefile.msvc | 2 | ||||
| -rw-r--r-- | auto/lib/zlib/makefile.owc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make index 05b2e86fa..ff9ada0ae 100644 --- a/auto/lib/zlib/make +++ b/auto/lib/zlib/make @@ -31,12 +31,12 @@ case $PLATFORM in cp auto/lib/zlib/$makefile $ZLIB echo " cd $ZLIB" >> $MAKEFILE - echo " \$(MAKE) -f $makefile OWC_OPT=$OWC_OPT" >> $MAKEFILE + echo " \$(MAKE) -f $makefile LIB_OPT=$LIB_OPT" >> $MAKEFILE echo " cd ..\\..\\.." >> $MAKEFILE ;; - *:i386) + *:i386 | *:i686) echo " cd $ZLIB \\" >> $MAKEFILE echo " && cp contrib/asm686/match.S . \\" >> $MAKEFILE echo " && CFLAGS=\"-O3 -DASMV\" ./configure \\" >> $MAKEFILE diff --git a/auto/lib/zlib/makefile.msvc b/auto/lib/zlib/makefile.msvc index 69f0c1897..1d38c5b6c 100644 --- a/auto/lib/zlib/makefile.msvc +++ b/auto/lib/zlib/makefile.msvc @@ -1,5 +1,5 @@ -CFLAGS = -nologo -c -MT -O2 -Ob1 -Oi -Gs +CFLAGS = -nologo -c -MT -O2 -Ob1 -Oi -Gs $(LIB_OPT) zlib.lib: cl $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c diff --git a/auto/lib/zlib/makefile.owc b/auto/lib/zlib/makefile.owc index 3fa026040..1a2823b40 100644 --- a/auto/lib/zlib/makefile.owc +++ b/auto/lib/zlib/makefile.owc @@ -1,5 +1,5 @@ -CFLAGS = -c -zq -bt=nt -ot -op -oi -oe -s -bm $(OWC_OPT) +CFLAGS = -c -zq -bt=nt -ot -op -oi -oe -s -bm $(LIB_OPT) zlib.lib: wcl386 $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c |