build zlib in WIN32, not MSDOS mode

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/zlib/makefile.wat b/src/zlib/makefile.wat
index 8b6dab6273bb7f972cd02dff21d911faef309ad3..95842caf171fc9e0217bd4dcf4baa17398d0754d 100644 (file)
--- a/src/zlib/makefile.wat
+++ b/src/zlib/makefile.wat
@@ -13,7 +13,7 @@
 
 # ------------- Watcom 10a -------------
 MODEL=-mf 
 
 # ------------- Watcom 10a -------------
 MODEL=-mf 

-CFLAGS= $(MODEL) -fpi87 -fp5 -zp4 -5r -w5 -oneatx -DMSDOS
+CFLAGS= $(MODEL) -fpi87 -fp5 -zp4 -5r -w5 -oneatx -DWIN32

 CC=wcc386
 LD=wcl386
 LIB=wlib -b -c 
 CC=wcc386
 LD=wcl386
 LIB=wlib -b -c 


@@ -25,9 +25,6 @@ LIBTARGET=..\..\lib\zlib.lib
 OBJ1=adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) 
 OBJ2=trees$(O) zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) 
 OBJ3=infutil$(O) inffast$(O)
 OBJ1=adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) 
 OBJ2=trees$(O) zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) 
 OBJ3=infutil$(O) inffast$(O)

-OBJP1=adler32$(O)+compress$(O)+crc32$(O)+gzio$(O)+uncompr$(O)+deflate$(O)
-OBJP2=trees$(O)+zutil$(O)+inflate$(O)+infblock$(O)+inftrees$(O)+infcodes$(O)
-OBJP3=infutil$(O)+inffast$(O)

 
 # all: test
 
 
 # all: test
 


@@ -83,12 +80,11 @@ example.obj: example.c zlib.h zconf.h
 minigzip.obj: minigzip.c zlib.h zconf.h
        $(CC) $(CFLAGS) $*.c
 
 minigzip.obj: minigzip.c zlib.h zconf.h
        $(CC) $(CFLAGS) $*.c
 

-# we must cut the command line to fit in the MS/DOS 128 byte limit:
-$(LIBTARGET): $(OBJ1) $(OBJ2) $(OBJ3) 
-       if exist $(LIBTARGET) del $(LIBTARGET)
-       $(LIB) $(LIBTARGET) +$(OBJP1)
-       $(LIB) $(LIBTARGET) +$(OBJP2)
-       $(LIB) $(LIBTARGET) +$(OBJP3)
+$(LIBTARGET) : $(OBJECTS)
+       %create tmp.lbc
+       @for %i in ( $(OBJ1) $(OBJ2) $(OBJ3) ) do @%append tmp.lbc +%i
+       wlib /b /c /n /p=512 $^@ @tmp.lbc
+

 
 example.exe: example.obj $(LIBTARGET)
        $(LD) $(LDFLAGS) example.obj $(LIBTARGET)
 
 example.exe: example.obj $(LIBTARGET)
        $(LD) $(LDFLAGS) example.obj $(LIBTARGET)