diff options
| author | Matthias Klose <doko@ubuntu.com> | 2012-03-02 17:15:20 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@gcc.gnu.org> | 2012-03-02 17:15:20 +0000 |
| commit | 43743d63b3e6026088cb5bacca87ccc08acd97cd (patch) | |
| tree | 08301625dedcb8a8837a464f46ca0292c54c5ecb /zlib/contrib/delphi | |
| parent | 5d216c70d980e3169b42e9734cf4bea1648ff8f0 (diff) | |
| download | gcc-43743d63b3e6026088cb5bacca87ccc08acd97cd.zip gcc-43743d63b3e6026088cb5bacca87ccc08acd97cd.tar.gz gcc-43743d63b3e6026088cb5bacca87ccc08acd97cd.tar.bz2 | |
2012-03-02 Matthias Klose <doko@ubuntu.com>
* Imported zlib 1.2.5; merged local changes.
From-SVN: r184805
Diffstat (limited to 'zlib/contrib/delphi')
| -rw-r--r-- | zlib/contrib/delphi/ZLib.pas | 2 | ||||
| -rw-r--r-- | zlib/contrib/delphi/zlibd32.mak | 16 |
2 files changed, 12 insertions, 6 deletions
diff --git a/zlib/contrib/delphi/ZLib.pas b/zlib/contrib/delphi/ZLib.pas index 3f2b8b4..0d86fb5 100644 --- a/zlib/contrib/delphi/ZLib.pas +++ b/zlib/contrib/delphi/ZLib.pas @@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer; const OutBuf: Pointer; BufSize: Integer); const - zlib_version = '1.2.3'; + zlib_version = '1.2.5'; type EZlibError = class(Exception); diff --git a/zlib/contrib/delphi/zlibd32.mak b/zlib/contrib/delphi/zlibd32.mak index 88fafa0..0d0699a 100644 --- a/zlib/contrib/delphi/zlibd32.mak +++ b/zlib/contrib/delphi/zlibd32.mak @@ -18,10 +18,10 @@ LDFLAGS = # 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 -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 +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 +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 # targets @@ -38,7 +38,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 |