1 files changed, 34 insertions, 18 deletions

diff --git a/win32/Makefile.bor b/win32/Makefile.bor
index f1a1c46..b802519 100644
--- a/win32/Makefile.bor
+++ b/win32/Makefile.bor
@@ -1,37 +1,48 @@
 # Makefile for zlib
 # Borland C++ for Win32
-# Updated for zlib-1.2.x by Cosmin Truta, 11-Mar-2003.
-
-# Usage: "make -f win32/makefile.bor"
-
-# ------------ Borland C++ for Win32 ------------
-
-#    Optional nonstandard preprocessor flags (e.g. -DMAX_MEM_LEVEL=7)
-#    should be added to the environment via "set LOCAL_ZLIB=-DFOO" or added
-#    to the declaration of LOC here:
+#
+# Updated for zlib 1.2.x by Cosmin Truta, 11-Mar-2003
+# Last updated: 28-Aug-2003
+#
+# Usage:
+#  make -f win32/Makefile.bor
+#  make -f win32/Makefile.bor LOCAL_ZLIB=-DASMV OBJA=match.obj OBJPA=+match.obj
+
+# ------------ Borland C++ ------------
+
+# Optional nonstandard preprocessor flags (e.g. -DMAX_MEM_LEVEL=7)
+# should be added to the environment via "set LOCAL_ZLIB=-DFOO" or
+# added to the declaration of LOC here:
 LOC = $(LOCAL_ZLIB)
 
 CC = bcc32
+AS = bcc32
 LD = bcc32
 AR = tlib
-CFLAGS = -O2 -d -k- $(LOC)
+CFLAGS  = -a -d -k- -O2 $(LOC)
+ASFLAGS = $(LOC)
 LDFLAGS = $(LOC)
 
 
 # variables
 ZLIB_LIB = zlib.lib
 
-OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infback.obj
-OBJ2 = inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
+OBJ1  = adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infback.obj
+OBJ2  = inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
+#OBJA =
 OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzio.obj+infback.obj
 OBJP2 = +inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
+#OBJPA=
 
 
 # targets
 all: $(ZLIB_LIB) example.exe minigzip.exe
 
 .c.obj:
-        $(CC) -c $(CFLAGS) $*.c
+        $(CC) -c $(CFLAGS) $<
+
+.asm.obj:
+        $(AS) -c $(ASFLAGS) $<
 
 adler32.obj: adler32.c zlib.h zconf.h
 
@@ -67,10 +78,17 @@ minigzip.obj: minigzip.c zlib.h zconf.h
 
 # For the sake of the old Borland make,
 # the command line is cut to fit in the MS-DOS 128 byte limit:
-$(ZLIB_LIB): $(OBJ1) $(OBJ2)
+$(ZLIB_LIB): $(OBJ1) $(OBJ2) $(OBJA)
         -del $(ZLIB_LIB)
         $(AR) $(ZLIB_LIB) $(OBJP1)
         $(AR) $(ZLIB_LIB) $(OBJP2)
+        $(AR) $(ZLIB_LIB) $(OBJPA)
+
+
+# testing
+test: example.exe minigzip.exe
+        example
+        echo hello world | minigzip | minigzip -d
 
 example.exe: example.obj $(ZLIB_LIB)
         $(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
@@ -78,14 +96,12 @@ example.exe: example.obj $(ZLIB_LIB)
 minigzip.exe: minigzip.obj $(ZLIB_LIB)
         $(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
 
-test: example.exe minigzip.exe
-        example
-        echo hello world | minigzip | minigzip -d 
 
+# cleanup
 clean:
         -del *.obj
-        -del *.exe
         -del *.lib
+        -del *.exe
         -del *.tds
         -del zlib.bak
         -del foo.gz