diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-03-11 21:34:52 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-03-11 21:34:52 +0000 |
| commit | a893eab667078a8ad9f473296663b36e6ade111a (patch) | |
| tree | 5eb4a198f0e0976948fc154c832663db661a4a91 /auto/lib/zlib | |
| parent | 6bb889f442bd7c5c6f640021014014ebc59bac27 (diff) | |
| download | nginx-a893eab667078a8ad9f473296663b36e6ade111a.tar.gz nginx-a893eab667078a8ad9f473296663b36e6ade111a.tar.bz2 | |
nginx-0.0.2-2004-03-12-00:34:52 import
Diffstat (limited to 'auto/lib/zlib')
| -rw-r--r-- | auto/lib/zlib/make | 32 | ||||
| -rw-r--r-- | auto/lib/zlib/makefile.msvc | 2 |
2 files changed, 20 insertions, 14 deletions
diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make index 50a655934..2c02ca717 100644 --- a/auto/lib/zlib/make +++ b/auto/lib/zlib/make @@ -25,14 +25,19 @@ case $PLATFORM in esac +done=NO + + case $PLATFORM in win32) cp auto/lib/zlib/$makefile $ZLIB echo " cd $ZLIB" >> $MAKEFILE - echo " \$(MAKE) -f $makefile CPU_OPT=$CPU_OPT" >> $MAKEFILE + echo " \$(MAKE) -f $makefile CPU_OPT=$CPU_OPT LIBC=$LIBC">> $MAKEFILE echo " cd ..\\..\\.." >> $MAKEFILE + + done=YES ;; @@ -40,21 +45,22 @@ case $PLATFORM in 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 " && CC=$CC CFLAGS=\"$ZLIB_OPT -DASMV\" \\" >> $MAKEFILE + echo " ./configure \\" >> $MAKEFILE + echo " && \$(MAKE) OBJA=match.o libz.a" >> $MAKEFILE - *) - echo " cd $ZLIB \\" >> $MAKEFILE - echo " && CC=$CC $ZLIB_OPT ./configure \\" >> $MAKEFILE - echo " && \$(MAKE)" >> $MAKEFILE + done=YES + fi ;; esac + +if [ $done = NO ]; then + echo " cd $ZLIB \\" >> $MAKEFILE + echo " && CC=$CC CFLAGS=\"$ZLIB_OPT\" ./configure \\" >> $MAKEFILE + echo " && \$(MAKE) libz.a" >> $MAKEFILE +fi + + echo >> $MAKEFILE diff --git a/auto/lib/zlib/makefile.msvc b/auto/lib/zlib/makefile.msvc index ebb11d3fa..fe3f4f35d 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 $(CPU_OPT) +CFLAGS = -nologo -c -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) zlib.lib: cl $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c |