diff options
Diffstat (limited to 'auto/lib/zlib')
| -rw-r--r-- | auto/lib/zlib/conf | 10 | ||||
| -rw-r--r-- | auto/lib/zlib/make | 16 | ||||
| -rw-r--r-- | auto/lib/zlib/makefile.bcc | 8 | ||||
| -rw-r--r-- | auto/lib/zlib/makefile.msvc | 4 | ||||
| -rw-r--r-- | auto/lib/zlib/makefile.owc | 4 |
5 files changed, 27 insertions, 15 deletions
diff --git a/auto/lib/zlib/conf b/auto/lib/zlib/conf index c699ca63f..82cc5edc8 100644 --- a/auto/lib/zlib/conf +++ b/auto/lib/zlib/conf @@ -1,16 +1,10 @@ if [ $ZLIB != NONE ]; then - CORE_INCS="$CORE_INCS -I $ZLIB" + CORE_INCS="$CORE_INCS $ZLIB" case "$CC" in - cl) - LINK_DEPS="$LINK_DEPS $ZLIB/zlib.lib" - CORE_LIBS="$CORE_LIBS zlib.lib" - CORE_LINK="$CORE_LINK -libpath:$ZLIB" - ;; - - wcl386) + cl | wcl386 | bcc32) LINK_DEPS="$LINK_DEPS $ZLIB/zlib.lib" CORE_LIBS="$CORE_LIBS $ZLIB/zlib.lib" ;; diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make index 00b08bb1e..c44273065 100644 --- a/auto/lib/zlib/make +++ b/auto/lib/zlib/make @@ -3,10 +3,18 @@ case "$CC" in cl) makefile=makefile.msvc + opt="CPU_OPT=$CPU_OPT LIBC=$LIBC" + ;; wcl386) makefile=makefile.owc + opt="CPU_OPT=$CPU_OPT" + ;; + + bcc32) + makefile=makefile.bcc + opt="-DCPU_OPT=$CPU_OPT" ;; esac @@ -15,7 +23,8 @@ esac case $PLATFORM in win32) - echo "$ZLIB/zlib.lib:" >> $MAKEFILE + line=`echo $ZLIB/zlib.lib: | sed -e "s/\//$DIRSEP/g"` + echo "$line" >> $MAKEFILE ;; *) @@ -31,10 +40,11 @@ done=NO case $PLATFORM in win32) + zlib=`echo $ZLIB | sed -e "s/\//$DIRSEP/g"` cp auto/lib/zlib/$makefile $ZLIB - echo " cd $ZLIB" >> $MAKEFILE - echo " \$(MAKE) -f $makefile CPU_OPT=$CPU_OPT LIBC=$LIBC">> $MAKEFILE + echo " cd $zlib" >> $MAKEFILE + echo " \$(MAKE) -f $makefile $opt" >> $MAKEFILE echo " cd ..\\..\\.." >> $MAKEFILE done=YES diff --git a/auto/lib/zlib/makefile.bcc b/auto/lib/zlib/makefile.bcc new file mode 100644 index 000000000..0ec4de835 --- /dev/null +++ b/auto/lib/zlib/makefile.bcc @@ -0,0 +1,8 @@ + +CFLAGS = -q -O2 -tWM $(CPU_OPT) + +zlib.lib: + bcc32 -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c + + tlib zlib.lib +adler32.obj +crc32.obj +deflate.obj \ + +trees.obj +zutil.obj diff --git a/auto/lib/zlib/makefile.msvc b/auto/lib/zlib/makefile.msvc index fe3f4f35d..a9983efdf 100644 --- a/auto/lib/zlib/makefile.msvc +++ b/auto/lib/zlib/makefile.msvc @@ -1,8 +1,8 @@ -CFLAGS = -nologo -c -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) +CFLAGS = -nologo -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) zlib.lib: - cl $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c + cl -c $(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 index e119bb9e3..bc57d20cf 100644 --- a/auto/lib/zlib/makefile.owc +++ b/auto/lib/zlib/makefile.owc @@ -1,6 +1,6 @@ -CFLAGS = -c -zq -bt=nt -ot -op -oi -oe -s -bm $(CPU_OPT) +CFLAGS = -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 + wcl386 -c $(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 |