Skip to content

Commit 06b25e5

Browse files
committed
Update zlib (#474)
* Update zlib * Additional changes * Typo * Update makefile.mk (cherry picked from commit 7c92c44)
1 parent 6622f37 commit 06b25e5

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

main/external_deps.lst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ if (SYSTEM_REDLAND != YES)
103103
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
104104

105105
if (GUI!=UNX || SYSTEM_ZLIB!=YES)
106-
MD5 = 9855b6d802d7fe5b7bd5b196a2271655
107-
name = zlib-1.3.1.tar.gz
106+
MD5 = a1e6c958597af3c67d162995a342138a
107+
name = zlib-1.3.2.tar.gz
108108
URL1 = https://www.zlib.net/fossils/$(name)
109109
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
110110

main/zlib/makefile.mk

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ all:
3838

3939
# --- Files --------------------------------------------------------
4040

41-
TARFILE_NAME=zlib-1.3.1
42-
TARFILE_MD5=9855b6d802d7fe5b7bd5b196a2271655
41+
TARFILE_NAME=zlib-1.3.2
42+
TARFILE_MD5=a1e6c958597af3c67d162995a342138a
4343

44-
PATCH_FILES=zlib-1.3.1.patch
44+
PATCH_FILES=zlib-1.3.2.patch
4545
ADDITIONAL_FILES=makefile.mk
4646

4747
#relative to CONFIGURE_DIR
@@ -53,6 +53,7 @@ OUT2INC= \
5353
zlib.h \
5454
zconf.h \
5555
contrib$/minizip$/unzip.h \
56+
contrib$/minizip$/ints.h \
5657
contrib$/minizip$/ioapi.h
5758

5859
PATCHED_HEADERS=$(INCCOM)$/patched$/zlib.h

main/zlib/prj/d.lst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ mkdir: %_DEST%\lib%_EXT%\x64
44
..\%__SRC%\inc\patched\zlib.h %_DEST%\inc%_EXT%\external\zlib\zlib.h
55
..\%__SRC%\inc\unzip.h %_DEST%\inc%_EXT%\external\zlib\unzip.h
66
..\%__SRC%\inc\ioapi.h %_DEST%\inc%_EXT%\external\zlib\ioapi.h
7+
..\%__SRC%\inc\ints.h %_DEST%\inc%_EXT%\external\zlib\ints.h
78
..\%__SRC%\inc\zconf.h %_DEST%\inc%_EXT%\external\zlib\zconf.h
89

910
..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- misc/zlib-1.3.1/makefile.mk Fri Mar 14 10:17:06 2008
2-
+++ misc/build/zlib-1.3.1/makefile.mk Fri Mar 14 10:16:56 2008
1+
--- misc/zlib-1.3.2/makefile.mk Fri Mar 14 10:17:06 2008
2+
+++ misc/build/zlib-1.3.2/makefile.mk Fri Mar 14 10:16:56 2008
33
@@ -1 +1,82 @@
44
-dummy
55
+#*************************************************************************

0 commit comments

Comments
 (0)