diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-03-10 20:56:39 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-03-10 20:56:39 +0000 |
| commit | 7b90834fbab2f2d5979a2787674bb246139405d9 (patch) | |
| tree | 6a2234fff3dfa74b1afa76e31ccd427c5d3bace3 /auto/lib/zlib | |
| parent | 24b56c92bb344a5377f02eda85c639f86a8592ff (diff) | |
| download | nginx-7b90834fbab2f2d5979a2787674bb246139405d9.tar.gz nginx-7b90834fbab2f2d5979a2787674bb246139405d9.tar.bz2 | |
nginx-0.0.2-2004-03-10-23:56:39 import
Diffstat (limited to 'auto/lib/zlib')
| -rw-r--r-- | auto/lib/zlib/make | 20 | ||||
| -rw-r--r-- | auto/lib/zlib/makefile.msvc | 2 | ||||
| -rw-r--r-- | auto/lib/zlib/makefile.owc | 2 |
3 files changed, 16 insertions, 8 deletions
diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make index ff9ada0ae..50a655934 100644 --- a/auto/lib/zlib/make +++ b/auto/lib/zlib/make @@ -31,20 +31,28 @@ case $PLATFORM in cp auto/lib/zlib/$makefile $ZLIB echo " cd $ZLIB" >> $MAKEFILE - echo " \$(MAKE) -f $makefile LIB_OPT=$LIB_OPT" >> $MAKEFILE + echo " \$(MAKE) -f $makefile CPU_OPT=$CPU_OPT" >> $MAKEFILE echo " cd ..\\..\\.." >> $MAKEFILE ;; *:i386 | *:i686) - echo " cd $ZLIB \\" >> $MAKEFILE - echo " && cp contrib/asm686/match.S . \\" >> $MAKEFILE - echo " && CFLAGS=\"-O3 -DASMV\" ./configure \\" >> $MAKEFILE - echo " && \$(MAKE) OBJA=match.o" >> $MAKEFILE + if [ $ZLIB_ASM = pentiumpro ]; then + echo " cd $ZLIB \\" >> $MAKEFILE + echo " && cp contrib/asm686/match.S . \\" >> $MAKEFILE + echo " && CC=$CC $ZLIB_OPT ./configure \\" >> $MAKEFILE + echo " && \$(MAKE) OBJA=match.o" >> $MAKEFILE + else + echo " cd $ZLIB \\" >> $MAKEFILE + echo " && CC=$CC $ZLIB_OPT ./configure \\" >> $MAKEFILE + echo " && \$(MAKE)" >> $MAKEFILE + fi ;; *) - echo " cd $ZLIB && ./configure && \$(MAKE)" >> $MAKEFILE + echo " cd $ZLIB \\" >> $MAKEFILE + echo " && CC=$CC $ZLIB_OPT ./configure \\" >> $MAKEFILE + echo " && \$(MAKE)" >> $MAKEFILE ;; esac diff --git a/auto/lib/zlib/makefile.msvc b/auto/lib/zlib/makefile.msvc index 1d38c5b6c..ebb11d3fa 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 $(LIB_OPT) +CFLAGS = -nologo -c -MT -O2 -Ob1 -Oi -Gs $(CPU_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 1a2823b40..e119bb9e3 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 $(LIB_OPT) +CFLAGS = -c -zq -bt=nt -ot -op -oi -oe -s -bm $(CPU_OPT) zlib.lib: wcl386 $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c |