diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-22 15:53:45 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-22 15:54:13 +0200 |
| commit | 7baa3d795c87c11550f1686488c968320428cbf9 (patch) | |
| tree | 4c932d59c53a0d358916a7c66af5103b8bf22813 /zlib/win32/Makefile.bor | |
| parent | e1a407256a5c1571d8f4871fd981a51cfbd46e37 (diff) | |
| download | vcxsrv-7baa3d795c87c11550f1686488c968320428cbf9.tar.gz vcxsrv-7baa3d795c87c11550f1686488c968320428cbf9.tar.bz2 vcxsrv-7baa3d795c87c11550f1686488c968320428cbf9.zip | |
Switch to zlib 1.2.7
Diffstat (limited to 'zlib/win32/Makefile.bor')
| -rw-r--r-- | zlib/win32/Makefile.bor | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/zlib/win32/Makefile.bor b/zlib/win32/Makefile.bor index b802519ca..d152bbb7f 100644 --- a/zlib/win32/Makefile.bor +++ b/zlib/win32/Makefile.bor @@ -1,9 +1,6 @@ # Makefile for zlib # Borland C++ for Win32 # -# 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 @@ -27,11 +24,11 @@ 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 gzclose.obj gzlib.obj gzread.obj +OBJ2 = gzwrite.obj infback.obj 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 +OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj +OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj #OBJPA= @@ -52,7 +49,13 @@ crc32.obj: crc32.c zlib.h zconf.h crc32.h deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h -gzio.obj: gzio.c zutil.h zlib.h zconf.h +gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h + +gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h + +gzread.obj: gzread.c zlib.h zconf.h gzguts.h + +gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ inffast.h inffixed.h @@ -71,9 +74,9 @@ uncompr.obj: uncompr.c zlib.h zconf.h zutil.obj: zutil.c zutil.h zlib.h zconf.h -example.obj: example.c zlib.h zconf.h +example.obj: test/example.c zlib.h zconf.h -minigzip.obj: minigzip.c zlib.h zconf.h +minigzip.obj: test/minigzip.c zlib.h zconf.h # For the sake of the old Borland make, @@ -99,8 +102,8 @@ minigzip.exe: minigzip.obj $(ZLIB_LIB) # cleanup clean: + -del $(ZLIB_LIB) -del *.obj - -del *.lib -del *.exe -del *.tds -del zlib.bak |