summaryrefslogtreecommitdiff
path: root/Build/source/libs/zlib/zlib-src/win32
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2022-04-04 22:35:30 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2022-04-04 22:35:30 +0000
commita949d5a895cfd0f14aa1759a36cc8b5fa52471c6 (patch)
tree4dd9056cc8fca2a60880c1f2a7848eb6cbd77dd2 /Build/source/libs/zlib/zlib-src/win32
parent0fe7398600cc177e0daad519a135544e9ca250e3 (diff)
zlib 1.2.12
git-svn-id: svn://tug.org/texlive/trunk@62907 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/zlib/zlib-src/win32')
-rw-r--r--Build/source/libs/zlib/zlib-src/win32/Makefile.bor1
-rw-r--r--Build/source/libs/zlib/zlib-src/win32/Makefile.gcc5
-rw-r--r--Build/source/libs/zlib/zlib-src/win32/Makefile.msc4
-rw-r--r--Build/source/libs/zlib/zlib-src/win32/README-WIN32.txt4
-rw-r--r--Build/source/libs/zlib/zlib-src/win32/zlib.def3
5 files changed, 5 insertions, 12 deletions
diff --git a/Build/source/libs/zlib/zlib-src/win32/Makefile.bor b/Build/source/libs/zlib/zlib-src/win32/Makefile.bor
index d152bbb7ffd..4495353f3f5 100644
--- a/Build/source/libs/zlib/zlib-src/win32/Makefile.bor
+++ b/Build/source/libs/zlib/zlib-src/win32/Makefile.bor
@@ -3,7 +3,6 @@
#
# Usage:
# make -f win32/Makefile.bor
-# make -f win32/Makefile.bor LOCAL_ZLIB=-DASMV OBJA=match.obj OBJPA=+match.obj
# ------------ Borland C++ ------------
diff --git a/Build/source/libs/zlib/zlib-src/win32/Makefile.gcc b/Build/source/libs/zlib/zlib-src/win32/Makefile.gcc
index 305be50afef..081e391eb29 100644
--- a/Build/source/libs/zlib/zlib-src/win32/Makefile.gcc
+++ b/Build/source/libs/zlib/zlib-src/win32/Makefile.gcc
@@ -11,10 +11,6 @@
#
# make -fwin32/Makefile.gcc; make test testdll -fwin32/Makefile.gcc
#
-# To use the asm code, type:
-# cp contrib/asm?86/match.S ./match.S
-# make LOC=-DASMV OBJA=match.o -fwin32/Makefile.gcc
-#
# To install libz.a, zconf.h and zlib.h in the system directories, type:
#
# make install -fwin32/Makefile.gcc
@@ -38,7 +34,6 @@ IMPLIB = libz.dll.a
#
SHARED_MODE=0
-#LOC = -DASMV
#LOC = -DZLIB_DEBUG -g
PREFIX =
diff --git a/Build/source/libs/zlib/zlib-src/win32/Makefile.msc b/Build/source/libs/zlib/zlib-src/win32/Makefile.msc
index 6831882de43..9c6515360e6 100644
--- a/Build/source/libs/zlib/zlib-src/win32/Makefile.msc
+++ b/Build/source/libs/zlib/zlib-src/win32/Makefile.msc
@@ -4,10 +4,6 @@
# Usage:
# nmake -f win32/Makefile.msc (standard build)
# nmake -f win32/Makefile.msc LOC=-DFOO (nonstandard build)
-# nmake -f win32/Makefile.msc LOC="-DASMV -DASMINF" \
-# OBJA="inffas32.obj match686.obj" (use ASM code, x86)
-# nmake -f win32/Makefile.msc AS=ml64 LOC="-DASMV -DASMINF -I." \
-# OBJA="inffasx64.obj gvmat64.obj inffas8664.obj" (use ASM code, x64)
# The toplevel directory of the source tree.
#
diff --git a/Build/source/libs/zlib/zlib-src/win32/README-WIN32.txt b/Build/source/libs/zlib/zlib-src/win32/README-WIN32.txt
index df7ab7f4b34..536cfec6f67 100644
--- a/Build/source/libs/zlib/zlib-src/win32/README-WIN32.txt
+++ b/Build/source/libs/zlib/zlib-src/win32/README-WIN32.txt
@@ -1,6 +1,6 @@
ZLIB DATA COMPRESSION LIBRARY
-zlib 1.2.11 is a general purpose data compression library. All the code is
+zlib 1.2.12 is a general purpose data compression library. All the code is
thread safe. The data format used by the zlib library is described by RFCs
(Request for Comments) 1950 to 1952 in the files
http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
@@ -22,7 +22,7 @@ before asking for help.
Manifest:
-The package zlib-1.2.11-win32-x86.zip will contain the following files:
+The package zlib-1.2.12-win32-x86.zip will contain the following files:
README-WIN32.txt This document
ChangeLog Changes since previous zlib packages
diff --git a/Build/source/libs/zlib/zlib-src/win32/zlib.def b/Build/source/libs/zlib/zlib-src/win32/zlib.def
index a2188b00062..666bc6fbbb1 100644
--- a/Build/source/libs/zlib/zlib-src/win32/zlib.def
+++ b/Build/source/libs/zlib/zlib-src/win32/zlib.def
@@ -69,6 +69,7 @@ EXPORTS
gzoffset64
adler32_combine64
crc32_combine64
+ crc32_combine_gen64
; checksum functions
adler32
adler32_z
@@ -76,6 +77,8 @@ EXPORTS
crc32_z
adler32_combine
crc32_combine
+ crc32_combine_gen
+ crc32_combine_op
; various hacks, don't look :)
deflateInit_
deflateInit2_