Skip to content

Commit 14c6046

Browse files
housisonghousisong
committed
update zlib v1.2.11 to v1.3.1;
1 parent e4c9c86 commit 14c6046

15 files changed

+84
-84
lines changed

‎.gitmodules

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
[submodule "zlib1.2.11"]
2-
path = zlib1.2.11
1+
[submodule "zlib1.3.1"]
2+
path = zlib1.3.1
33
url = https://github.com/sisong/zlib.git
44
[submodule "HDiffPatch"]
55
path = HDiffPatch

‎Makefile

+11-11
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ M32 := 0
88
MINS := 0
99

1010
ZLIB_OBJ := \
11-
zlib1.2.11/adler32.o \
12-
zlib1.2.11/compress.o \
13-
zlib1.2.11/crc32.o \
14-
zlib1.2.11/deflate.o \
15-
zlib1.2.11/infback.o \
16-
zlib1.2.11/inffast.o \
17-
zlib1.2.11/inflate.o \
18-
zlib1.2.11/inftrees.o \
19-
zlib1.2.11/trees.o \
20-
zlib1.2.11/uncompr.o \
21-
zlib1.2.11/zutil.o
11+
zlib1.3.1/adler32.o \
12+
zlib1.3.1/compress.o \
13+
zlib1.3.1/crc32.o \
14+
zlib1.3.1/deflate.o \
15+
zlib1.3.1/infback.o \
16+
zlib1.3.1/inffast.o \
17+
zlib1.3.1/inflate.o \
18+
zlib1.3.1/inftrees.o \
19+
zlib1.3.1/trees.o \
20+
zlib1.3.1/uncompr.o \
21+
zlib1.3.1/zutil.o
2222

2323
ZIPPATCH_OBJ := \
2424
src/patch/NewStream.o \

‎builds/android_ndk_jni_mk/Android.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
99
Lzma_Files += $(LOCAL_PATH)/../../lzma/Asm/arm64/LzmaDecOpt.S
1010
endif
1111

12-
ZLIB_PATH := $(LOCAL_PATH)/../../zlib1.2.11
12+
ZLIB_PATH := $(LOCAL_PATH)/../../zlib1.3.1
1313
Zlib_Files := $(ZLIB_PATH)/crc32.c \
1414
$(ZLIB_PATH)/deflate.c \
1515
$(ZLIB_PATH)/inflate.c \

‎builds/android_ndk_jni_mk/Android_DEBUG.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
1010
Lzma_Files += $(LOCAL_PATH)/../../lzma/Asm/arm64/LzmaDecOpt.S
1111
endif
1212

13-
ZLIB_PATH := $(LOCAL_PATH)/../../zlib1.2.11
13+
ZLIB_PATH := $(LOCAL_PATH)/../../zlib1.3.1
1414
Zlib_Files := $(ZLIB_PATH)/crc32.c \
1515
$(ZLIB_PATH)/deflate.c \
1616
$(ZLIB_PATH)/inflate.c \

‎builds/codeblocks/ApkNormalized.cbp

+10-10
Original file line numberDiff line numberDiff line change
@@ -58,34 +58,34 @@
5858
<Unit filename="../../src/normalized/normalized.cpp" />
5959
<Unit filename="../../src/patch/OldStream.cpp" />
6060
<Unit filename="../../src/patch/Zipper.cpp" />
61-
<Unit filename="../../zlib1.2.11/adler32.c">
61+
<Unit filename="../../zlib1.3.1/adler32.c">
6262
<Option compilerVar="CC" />
6363
</Unit>
64-
<Unit filename="../../zlib1.2.11/compress.c">
64+
<Unit filename="../../zlib1.3.1/compress.c">
6565
<Option compilerVar="CC" />
6666
</Unit>
67-
<Unit filename="../../zlib1.2.11/crc32.c">
67+
<Unit filename="../../zlib1.3.1/crc32.c">
6868
<Option compilerVar="CC" />
6969
</Unit>
70-
<Unit filename="../../zlib1.2.11/deflate.c">
70+
<Unit filename="../../zlib1.3.1/deflate.c">
7171
<Option compilerVar="CC" />
7272
</Unit>
73-
<Unit filename="../../zlib1.2.11/inffast.c">
73+
<Unit filename="../../zlib1.3.1/inffast.c">
7474
<Option compilerVar="CC" />
7575
</Unit>
76-
<Unit filename="../../zlib1.2.11/inflate.c">
76+
<Unit filename="../../zlib1.3.1/inflate.c">
7777
<Option compilerVar="CC" />
7878
</Unit>
79-
<Unit filename="../../zlib1.2.11/inftrees.c">
79+
<Unit filename="../../zlib1.3.1/inftrees.c">
8080
<Option compilerVar="CC" />
8181
</Unit>
82-
<Unit filename="../../zlib1.2.11/trees.c">
82+
<Unit filename="../../zlib1.3.1/trees.c">
8383
<Option compilerVar="CC" />
8484
</Unit>
85-
<Unit filename="../../zlib1.2.11/uncompr.c">
85+
<Unit filename="../../zlib1.3.1/uncompr.c">
8686
<Option compilerVar="CC" />
8787
</Unit>
88-
<Unit filename="../../zlib1.2.11/zutil.c">
88+
<Unit filename="../../zlib1.3.1/zutil.c">
8989
<Option compilerVar="CC" />
9090
</Unit>
9191
<Extensions>

‎builds/codeblocks/ZipDiff.cbp

+11-11
Original file line numberDiff line numberDiff line change
@@ -122,37 +122,37 @@
122122
<Unit filename="../../src/patch/ZipDiffData.cpp" />
123123
<Unit filename="../../src/patch/Zipper.cpp" />
124124
<Unit filename="../../src/zip_diff.cpp" />
125-
<Unit filename="../../zlib1.2.11/adler32.c">
125+
<Unit filename="../../zlib1.3.1/adler32.c">
126126
<Option compilerVar="CC" />
127127
</Unit>
128-
<Unit filename="../../zlib1.2.11/compress.c">
128+
<Unit filename="../../zlib1.3.1/compress.c">
129129
<Option compilerVar="CC" />
130130
</Unit>
131-
<Unit filename="../../zlib1.2.11/crc32.c">
131+
<Unit filename="../../zlib1.3.1/crc32.c">
132132
<Option compilerVar="CC" />
133133
</Unit>
134-
<Unit filename="../../zlib1.2.11/deflate.c">
134+
<Unit filename="../../zlib1.3.1/deflate.c">
135135
<Option compilerVar="CC" />
136136
</Unit>
137-
<Unit filename="../../zlib1.2.11/infback.c">
137+
<Unit filename="../../zlib1.3.1/infback.c">
138138
<Option compilerVar="CC" />
139139
</Unit>
140-
<Unit filename="../../zlib1.2.11/inffast.c">
140+
<Unit filename="../../zlib1.3.1/inffast.c">
141141
<Option compilerVar="CC" />
142142
</Unit>
143-
<Unit filename="../../zlib1.2.11/inflate.c">
143+
<Unit filename="../../zlib1.3.1/inflate.c">
144144
<Option compilerVar="CC" />
145145
</Unit>
146-
<Unit filename="../../zlib1.2.11/inftrees.c">
146+
<Unit filename="../../zlib1.3.1/inftrees.c">
147147
<Option compilerVar="CC" />
148148
</Unit>
149-
<Unit filename="../../zlib1.2.11/trees.c">
149+
<Unit filename="../../zlib1.3.1/trees.c">
150150
<Option compilerVar="CC" />
151151
</Unit>
152-
<Unit filename="../../zlib1.2.11/uncompr.c">
152+
<Unit filename="../../zlib1.3.1/uncompr.c">
153153
<Option compilerVar="CC" />
154154
</Unit>
155-
<Unit filename="../../zlib1.2.11/zutil.c">
155+
<Unit filename="../../zlib1.3.1/zutil.c">
156156
<Option compilerVar="CC" />
157157
</Unit>
158158
<Extensions>

‎builds/codeblocks/ZipPatch.cbp

+11-11
Original file line numberDiff line numberDiff line change
@@ -72,37 +72,37 @@
7272
<Unit filename="../../src/patch/ZipDiffData.cpp" />
7373
<Unit filename="../../src/patch/Zipper.cpp" />
7474
<Unit filename="../../src/zip_patch.cpp" />
75-
<Unit filename="../../zlib1.2.11/adler32.c">
75+
<Unit filename="../../zlib1.3.1/adler32.c">
7676
<Option compilerVar="CC" />
7777
</Unit>
78-
<Unit filename="../../zlib1.2.11/compress.c">
78+
<Unit filename="../../zlib1.3.1/compress.c">
7979
<Option compilerVar="CC" />
8080
</Unit>
81-
<Unit filename="../../zlib1.2.11/crc32.c">
81+
<Unit filename="../../zlib1.3.1/crc32.c">
8282
<Option compilerVar="CC" />
8383
</Unit>
84-
<Unit filename="../../zlib1.2.11/deflate.c">
84+
<Unit filename="../../zlib1.3.1/deflate.c">
8585
<Option compilerVar="CC" />
8686
</Unit>
87-
<Unit filename="../../zlib1.2.11/infback.c">
87+
<Unit filename="../../zlib1.3.1/infback.c">
8888
<Option compilerVar="CC" />
8989
</Unit>
90-
<Unit filename="../../zlib1.2.11/inffast.c">
90+
<Unit filename="../../zlib1.3.1/inffast.c">
9191
<Option compilerVar="CC" />
9292
</Unit>
93-
<Unit filename="../../zlib1.2.11/inflate.c">
93+
<Unit filename="../../zlib1.3.1/inflate.c">
9494
<Option compilerVar="CC" />
9595
</Unit>
96-
<Unit filename="../../zlib1.2.11/inftrees.c">
96+
<Unit filename="../../zlib1.3.1/inftrees.c">
9797
<Option compilerVar="CC" />
9898
</Unit>
99-
<Unit filename="../../zlib1.2.11/trees.c">
99+
<Unit filename="../../zlib1.3.1/trees.c">
100100
<Option compilerVar="CC" />
101101
</Unit>
102-
<Unit filename="../../zlib1.2.11/uncompr.c">
102+
<Unit filename="../../zlib1.3.1/uncompr.c">
103103
<Option compilerVar="CC" />
104104
</Unit>
105-
<Unit filename="../../zlib1.2.11/zutil.c">
105+
<Unit filename="../../zlib1.3.1/zutil.c">
106106
<Option compilerVar="CC" />
107107
</Unit>
108108
<Extensions>

‎builds/vc/ApkNormalized.vcxproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@
2727
<ClCompile Include="..\..\src\patch\OldStream.cpp" />
2828
<ClCompile Include="..\..\src\patch\ZipDiffData.cpp" />
2929
<ClCompile Include="..\..\src\patch\Zipper.cpp" />
30-
<ClCompile Include="..\..\zlib1.2.11\adler32.c" />
31-
<ClCompile Include="..\..\zlib1.2.11\compress.c" />
32-
<ClCompile Include="..\..\zlib1.2.11\crc32.c" />
33-
<ClCompile Include="..\..\zlib1.2.11\deflate.c" />
34-
<ClCompile Include="..\..\zlib1.2.11\inffast.c" />
35-
<ClCompile Include="..\..\zlib1.2.11\inflate.c" />
36-
<ClCompile Include="..\..\zlib1.2.11\inftrees.c" />
37-
<ClCompile Include="..\..\zlib1.2.11\trees.c" />
38-
<ClCompile Include="..\..\zlib1.2.11\uncompr.c" />
39-
<ClCompile Include="..\..\zlib1.2.11\zutil.c" />
30+
<ClCompile Include="..\..\zlib1.3.1\adler32.c" />
31+
<ClCompile Include="..\..\zlib1.3.1\compress.c" />
32+
<ClCompile Include="..\..\zlib1.3.1\crc32.c" />
33+
<ClCompile Include="..\..\zlib1.3.1\deflate.c" />
34+
<ClCompile Include="..\..\zlib1.3.1\inffast.c" />
35+
<ClCompile Include="..\..\zlib1.3.1\inflate.c" />
36+
<ClCompile Include="..\..\zlib1.3.1\inftrees.c" />
37+
<ClCompile Include="..\..\zlib1.3.1\trees.c" />
38+
<ClCompile Include="..\..\zlib1.3.1\uncompr.c" />
39+
<ClCompile Include="..\..\zlib1.3.1\zutil.c" />
4040
</ItemGroup>
4141
<PropertyGroup Label="Globals">
4242
<ProjectGuid>{B7BA5C32-5DC9-431D-BFD7-35ED679CD797}</ProjectGuid>

‎builds/vc/ZipDiff.vcxproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@
4444
<ClCompile Include="..\..\src\patch\ZipDiffData.cpp" />
4545
<ClCompile Include="..\..\src\patch\Zipper.cpp" />
4646
<ClCompile Include="..\..\src\zip_diff.cpp" />
47-
<ClCompile Include="..\..\zlib1.2.11\adler32.c" />
48-
<ClCompile Include="..\..\zlib1.2.11\compress.c" />
49-
<ClCompile Include="..\..\zlib1.2.11\crc32.c" />
50-
<ClCompile Include="..\..\zlib1.2.11\deflate.c" />
51-
<ClCompile Include="..\..\zlib1.2.11\inffast.c" />
52-
<ClCompile Include="..\..\zlib1.2.11\inflate.c" />
53-
<ClCompile Include="..\..\zlib1.2.11\inftrees.c" />
54-
<ClCompile Include="..\..\zlib1.2.11\trees.c" />
55-
<ClCompile Include="..\..\zlib1.2.11\uncompr.c" />
56-
<ClCompile Include="..\..\zlib1.2.11\zutil.c" />
47+
<ClCompile Include="..\..\zlib1.3.1\adler32.c" />
48+
<ClCompile Include="..\..\zlib1.3.1\compress.c" />
49+
<ClCompile Include="..\..\zlib1.3.1\crc32.c" />
50+
<ClCompile Include="..\..\zlib1.3.1\deflate.c" />
51+
<ClCompile Include="..\..\zlib1.3.1\inffast.c" />
52+
<ClCompile Include="..\..\zlib1.3.1\inflate.c" />
53+
<ClCompile Include="..\..\zlib1.3.1\inftrees.c" />
54+
<ClCompile Include="..\..\zlib1.3.1\trees.c" />
55+
<ClCompile Include="..\..\zlib1.3.1\uncompr.c" />
56+
<ClCompile Include="..\..\zlib1.3.1\zutil.c" />
5757
</ItemGroup>
5858
<ItemGroup>
5959
<ProjectReference Include="..\..\HDiffPatch\builds\vc\lzma.vcxproj">

‎builds/vc/ZipPatch.vcxproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@
3232
<ClCompile Include="..\..\src\patch\ZipDiffData.cpp" />
3333
<ClCompile Include="..\..\src\patch\Zipper.cpp" />
3434
<ClCompile Include="..\..\src\zip_patch.cpp" />
35-
<ClCompile Include="..\..\zlib1.2.11\adler32.c" />
36-
<ClCompile Include="..\..\zlib1.2.11\compress.c" />
37-
<ClCompile Include="..\..\zlib1.2.11\crc32.c" />
38-
<ClCompile Include="..\..\zlib1.2.11\deflate.c" />
39-
<ClCompile Include="..\..\zlib1.2.11\inffast.c" />
40-
<ClCompile Include="..\..\zlib1.2.11\inflate.c" />
41-
<ClCompile Include="..\..\zlib1.2.11\inftrees.c" />
42-
<ClCompile Include="..\..\zlib1.2.11\trees.c" />
43-
<ClCompile Include="..\..\zlib1.2.11\uncompr.c" />
44-
<ClCompile Include="..\..\zlib1.2.11\zutil.c" />
35+
<ClCompile Include="..\..\zlib1.3.1\adler32.c" />
36+
<ClCompile Include="..\..\zlib1.3.1\compress.c" />
37+
<ClCompile Include="..\..\zlib1.3.1\crc32.c" />
38+
<ClCompile Include="..\..\zlib1.3.1\deflate.c" />
39+
<ClCompile Include="..\..\zlib1.3.1\inffast.c" />
40+
<ClCompile Include="..\..\zlib1.3.1\inflate.c" />
41+
<ClCompile Include="..\..\zlib1.3.1\inftrees.c" />
42+
<ClCompile Include="..\..\zlib1.3.1\trees.c" />
43+
<ClCompile Include="..\..\zlib1.3.1\uncompr.c" />
44+
<ClCompile Include="..\..\zlib1.3.1\zutil.c" />
4545
</ItemGroup>
4646
<PropertyGroup Label="Globals">
4747
<ProjectGuid>{69753A53-0320-4AF9-ADE7-A70F0C38358F}</ProjectGuid>

‎builds/xcode/zlib.xcodeproj/project.pbxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
D688888E204688D30042E2B3 = {
4646
isa = PBXGroup;
4747
children = (
48-
D6DA363820468A05009AEF45 /* zlib1.2.11 */,
48+
D6DA363820468A05009AEF45 /* zlib1.3.1 */,
4949
D6888898204688D30042E2B3 /* Products */,
5050
);
5151
sourceTree = "<group>";
@@ -58,7 +58,7 @@
5858
name = Products;
5959
sourceTree = "<group>";
6060
};
61-
D6DA363820468A05009AEF45 /* zlib1.2.11 */ = {
61+
D6DA363820468A05009AEF45 /* zlib1.3.1 */ = {
6262
isa = PBXGroup;
6363
children = (
6464
D6DA363B20468A05009AEF45 /* inflate.c */,
@@ -71,8 +71,8 @@
7171
D6DA375820468A05009AEF45 /* inffast.c */,
7272
D6DA375920468A05009AEF45 /* adler32.c */,
7373
);
74-
name = zlib1.2.11;
75-
path = ../../zlib1.2.11;
74+
name = zlib1.3.1;
75+
path = ../../zlib1.3.1;
7676
sourceTree = "<group>";
7777
};
7878
/* End PBXGroup section */

‎src/patch/Zipper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ static const hdiff_TCompress* compressPlugin =&zipCompatibleCompressPlugin.ba
4444
static hpatch_TDecompress* decompressPlugin=&zlibDecompressPlugin;
4545

4646
#if (_IS_NEED_FIXED_ZLIB_VERSION)
47-
# define kNormalizedZlibVersion "1.2.11" //fixed zlib version
47+
# define kNormalizedZlibVersion "1.3.1" //fixed zlib version
4848
#endif
4949

5050
#define check(v) { if (!(v)) { assert(false); return false; } }

‎src/patch/patch_types.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
#if (!_IsNeedIncludeDefaultCompressHead)
5454
# if (_IS_NEED_FIXED_ZLIB_VERSION)
55-
# include "../../zlib1.2.11/zlib.h" // http://zlib.net/ https://github.com/madler/zlib
55+
# include "../../zlib1.3.1/zlib.h" // http://zlib.net/ https://github.com/madler/zlib
5656
# else
5757
# include "zlib.h" //default by compiler environment
5858
# endif

‎zlib1.2.11

-1
This file was deleted.

‎zlib1.3.1

Submodule zlib1.3.1 added at 51b7f2a

0 commit comments

Comments
 (0)