build zlib in WIN32, not MSDOS mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
# ------------- Watcom 10a -------------
|
# ------------- Watcom 10a -------------
|
||||||
MODEL=-mf
|
MODEL=-mf
|
||||||
CFLAGS= $(MODEL) -fpi87 -fp5 -zp4 -5r -w5 -oneatx -DMSDOS
|
CFLAGS= $(MODEL) -fpi87 -fp5 -zp4 -5r -w5 -oneatx -DWIN32
|
||||||
CC=wcc386
|
CC=wcc386
|
||||||
LD=wcl386
|
LD=wcl386
|
||||||
LIB=wlib -b -c
|
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)
|
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)
|
OBJ2=trees$(O) zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O)
|
||||||
OBJ3=infutil$(O) inffast$(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
|
minigzip.obj: minigzip.c zlib.h zconf.h
|
||||||
$(CC) $(CFLAGS) $*.c
|
$(CC) $(CFLAGS) $*.c
|
||||||
|
|
||||||
# we must cut the command line to fit in the MS/DOS 128 byte limit:
|
$(LIBTARGET) : $(OBJECTS)
|
||||||
$(LIBTARGET): $(OBJ1) $(OBJ2) $(OBJ3)
|
%create tmp.lbc
|
||||||
if exist $(LIBTARGET) del $(LIBTARGET)
|
@for %i in ( $(OBJ1) $(OBJ2) $(OBJ3) ) do @%append tmp.lbc +%i
|
||||||
$(LIB) $(LIBTARGET) +$(OBJP1)
|
wlib /b /c /n /p=512 $^@ @tmp.lbc
|
||||||
$(LIB) $(LIBTARGET) +$(OBJP2)
|
|
||||||
$(LIB) $(LIBTARGET) +$(OBJP3)
|
|
||||||
|
|
||||||
example.exe: example.obj $(LIBTARGET)
|
example.exe: example.obj $(LIBTARGET)
|
||||||
$(LD) $(LDFLAGS) example.obj $(LIBTARGET)
|
$(LD) $(LDFLAGS) example.obj $(LIBTARGET)
|
||||||
|
Reference in New Issue
Block a user