diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-03-09 19:47:07 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-03-09 19:47:07 +0000 |
| commit | fc5a10aedcdd8cf261ecc164941562bc52fe415d (patch) | |
| tree | dc6ad97805a315afca82e852717f84debb30eb54 /auto/lib/zlib | |
| parent | 833823cbb89482710779c59206b77c197c3747d2 (diff) | |
| download | nginx-fc5a10aedcdd8cf261ecc164941562bc52fe415d.tar.gz nginx-fc5a10aedcdd8cf261ecc164941562bc52fe415d.tar.bz2 | |
nginx-0.0.2-2004-03-09-22:47:07 import
Diffstat (limited to 'auto/lib/zlib')
| -rw-r--r-- | auto/lib/zlib/conf | 26 | ||||
| -rw-r--r-- | auto/lib/zlib/make | 47 | ||||
| -rw-r--r-- | auto/lib/zlib/makefile.msvc | 8 | ||||
| -rw-r--r-- | auto/lib/zlib/makefile.owc | 6 |
4 files changed, 73 insertions, 14 deletions
diff --git a/auto/lib/zlib/conf b/auto/lib/zlib/conf index 60fd8d880..a779b21b6 100644 --- a/auto/lib/zlib/conf +++ b/auto/lib/zlib/conf @@ -2,13 +2,25 @@ if [ $ZLIB != NONE ]; then CORE_INCS="$CORE_INCS -I $ZLIB" - if [ "$PLATFORM" = "win32" ]; then - CORE_LIBS="$CORE_LIBS zlib.lib" - CORE_LINK="$CORE_LINK -libpath:$ZLIB" - else - LINK_DEPS="$LINK_DEPS $ZLIB/libz.a" - CORE_LIBS="$CORE_LIBS -L $ZLIB -lz" - fi + case $CC in + + cl) + LINK_DEPS="$LINK_DEPS $ZLIB/zlib.lib" + CORE_LIBS="$CORE_LIBS zlib.lib" + CORE_LINK="$CORE_LINK -libpath:$ZLIB" + ;; + + wcl386) + LINK_DEPS="$LINK_DEPS $ZLIB/zlib.lib" + CORE_LIBS="$CORE_LIBS $ZLIB/zlib.lib" + ;; + + *) + LINK_DEPS="$LINK_DEPS $ZLIB/libz.a" + CORE_LIBS="$CORE_LIBS -L $ZLIB -lz" + ;; + + esac else diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make index 78022c379..05b2e86fa 100644 --- a/auto/lib/zlib/make +++ b/auto/lib/zlib/make @@ -1,19 +1,52 @@ -echo "$ZLIB/libz.a:" >> $MAKEFILE +case $CC in + + cl) + makefile=makefile.msvc + ;; + + wcl386) + makefile=makefile.owc + ;; + +esac + case $PLATFORM in + win32) + echo "$ZLIB/zlib.lib:" >> $MAKEFILE + ;; + + *) + echo "$ZLIB/libz.a:" >> $MAKEFILE + ;; + +esac + + +case $PLATFORM in + + win32) + + cp auto/lib/zlib/$makefile $ZLIB + echo " cd $ZLIB" >> $MAKEFILE + echo " \$(MAKE) -f $makefile OWC_OPT=$OWC_OPT" >> $MAKEFILE + echo " cd ..\\..\\.." >> $MAKEFILE + ;; + + *:i386) - echo " cd $ZLIB \\" >> $MAKEFILE - echo " && cp contrib/asm686/match.S . \\" >> $MAKEFILE - echo " && CFLAGS=\"-O3 -DASMV\" ./configure \\" >> $MAKEFILE - echo " && \$(MAKE) OBJA=match.o" >> $MAKEFILE + echo " cd $ZLIB \\" >> $MAKEFILE + echo " && cp contrib/asm686/match.S . \\" >> $MAKEFILE + echo " && CFLAGS=\"-O3 -DASMV\" ./configure \\" >> $MAKEFILE + echo " && \$(MAKE) OBJA=match.o" >> $MAKEFILE ;; *) - echo " cd $ZLIB && ./configure && \$(MAKE)" >> $MAKEFILE + echo " cd $ZLIB && ./configure && \$(MAKE)" >> $MAKEFILE ;; esac -echo >> $MAKEFILE +echo >> $MAKEFILE diff --git a/auto/lib/zlib/makefile.msvc b/auto/lib/zlib/makefile.msvc new file mode 100644 index 000000000..69f0c1897 --- /dev/null +++ b/auto/lib/zlib/makefile.msvc @@ -0,0 +1,8 @@ + +CFLAGS = -nologo -c -MT -O2 -Ob1 -Oi -Gs + +zlib.lib: + cl $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c + + link -lib -out:zlib.lib adler32.obj crc32.obj deflate.obj \ + trees.obj zutil.obj diff --git a/auto/lib/zlib/makefile.owc b/auto/lib/zlib/makefile.owc new file mode 100644 index 000000000..3fa026040 --- /dev/null +++ b/auto/lib/zlib/makefile.owc @@ -0,0 +1,6 @@ + +CFLAGS = -c -zq -bt=nt -ot -op -oi -oe -s -bm $(OWC_OPT) + +zlib.lib: + wcl386 $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c + wlib -n zlib.lib adler32.obj crc32.obj deflate.obj trees.obj zutil.obj |