nginx-0.0.3-2004-03-29-21:43:58 import
diff --git a/auto/lib/md5/conf b/auto/lib/md5/conf
index 5c6a417..40fd747 100644
--- a/auto/lib/md5/conf
+++ b/auto/lib/md5/conf
@@ -10,17 +10,11 @@
OPENSSL_MD5=NO
fi
- CORE_INCS="$CORE_INCS -I $MD5"
+ CORE_INCS="$CORE_INCS $MD5"
case "$CC" in
- cl)
- LINK_DEPS="$LINK_DEPS $MD5/md5.lib"
- CORE_LIBS="$CORE_LIBS md5.lib"
- CORE_LINK="$CORE_LINK -libpath:$MD5"
- ;;
-
- wcl386)
+ cl | wcl386 | bcc32)
LINK_DEPS="$LINK_DEPS $MD5/md5.lib"
CORE_LIBS="$CORE_LIBS $MD5/md5.lib"
;;
diff --git a/auto/lib/md5/make b/auto/lib/md5/make
index 485bf41..2632c9b 100644
--- a/auto/lib/md5/make
+++ b/auto/lib/md5/make
@@ -3,10 +3,17 @@
cl)
makefile=makefile.msvc
+ opt="CPU_OPT=$CPU_OPT LIBC=$LIBC MD5_ASM=$MD5_ASM"
;;
wcl386)
makefile=makefile.owc
+ opt="CPU_OPT=$CPU_OPT"
+ ;;
+
+ bcc32)
+ makefile=makefile.bcc
+ opt="-DCPU_OPT=$CPU_OPT -DMD5_ASM=$MD5_ASM"
;;
esac
@@ -15,7 +22,8 @@
case $PLATFORM in
win32)
- echo "$MD5/md5.lib:" >> $MAKEFILE
+ line=`echo $MD5/md5.lib: | sed -e "s/\//$DIRSEP/g"`
+ echo "$line" >> $MAKEFILE
;;
*)
@@ -31,11 +39,11 @@
case $PLATFORM in
win32)
+ md5=`echo $MD5 | sed -e "s/\//$DIRSEP/g"`
cp auto/lib/md5/$makefile $MD5
- echo " cd $MD5" >> $MAKEFILE
- echo $ngx_n " \$(MAKE) -f $makefile" $ngx_c >> $MAKEFILE
- echo " CPU_OPT=$CPU_OPT LIBC=$LIBC MD5_ASM=$MD5_ASM" >> $MAKEFILE
+ echo " cd $md5" >> $MAKEFILE
+ echo " \$(MAKE) -f $makefile $opt" >> $MAKEFILE
echo " cd ..\\..\\.." >> $MAKEFILE
done=YES
diff --git a/auto/lib/md5/makefile.bcc b/auto/lib/md5/makefile.bcc
new file mode 100644
index 0000000..e3dd8aa
--- /dev/null
+++ b/auto/lib/md5/makefile.bcc
@@ -0,0 +1,16 @@
+
+CFLAGS = -q -O2 -tWM $(CPU_OPT) -DL_ENDIAN
+
+!if "$(MD5_ASM)" == "YES"
+
+md5.lib:
+ bcc32 -c $(CFLAGS) -DMD5_ASM md5_dgst.c
+ tlib md5.lib +md5_dgst.obj +asm/m-win32.obj
+
+!else
+
+md5.lib:
+ bcc32 -c $(CFLAGS) md5_dgst.c
+ tlib md5.lib +md5_dgst.obj
+
+!endif
diff --git a/auto/lib/md5/makefile.msvc b/auto/lib/md5/makefile.msvc
index 7ba190d..c497c39 100644
--- a/auto/lib/md5/makefile.msvc
+++ b/auto/lib/md5/makefile.msvc
@@ -1,16 +1,16 @@
-CFLAGS = -nologo -c -MT -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) -D L_ENDIAN
+CFLAGS = -nologo -MT -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) -D L_ENDIAN
!if "$(MD5_ASM)" == "YES"
md5.lib:
- cl $(CFLAGS) -D MD5_ASM md5_dgst.c
+ cl -c $(CFLAGS) -D MD5_ASM md5_dgst.c
link -lib -out:md5.lib md5_dgst.obj asm/m-win32.obj
!else
md5.lib:
- cl $(CFLAGS) md5_dgst.c
+ cl -c $(CFLAGS) md5_dgst.c
link -lib -out:md5.lib md5_dgst.obj
!endif
diff --git a/auto/lib/md5/makefile.owc b/auto/lib/md5/makefile.owc
index 2cb6b65..917acba 100644
--- a/auto/lib/md5/makefile.owc
+++ b/auto/lib/md5/makefile.owc
@@ -1,6 +1,6 @@
-CFLAGS = -c -zq -bt=nt -bm -ot -op -oi -oe -s $(CPU_OPT)
+CFLAGS = -zq -bt=nt -bm -ot -op -oi -oe -s $(CPU_OPT)
md5.lib:
- wcl386 $(CFLAGS) -dL_ENDIAN md5_dgst.c
+ wcl386 -c $(CFLAGS) -dL_ENDIAN md5_dgst.c
wlib -n md5.lib md5_dgst.obj
