diff options
Diffstat (limited to 'auto/lib/zlib/make')
| -rw-r--r-- | auto/lib/zlib/make | 32 |
1 files changed, 19 insertions, 13 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 |