Skip to content

Commit

Permalink
update zlib v1.2.11 to v1.3.1;
Browse files Browse the repository at this point in the history
  • Loading branch information
@housisong
housisong committed Jul 6, 2024
1 parent e4c9c86 commit 14c6046
Show file tree
Hide file tree
Showing 15 changed files with 84 additions and 84 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[submodule "zlib1.2.11"]
path = zlib1.2.11
[submodule "zlib1.3.1"]
path = zlib1.3.1
url = https://github.com/sisong/zlib.git
[submodule "HDiffPatch"]
path = HDiffPatch
Expand Down
22 changes: 11 additions & 11 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ M32 := 0
MINS := 0

ZLIB_OBJ := \
zlib1.2.11/adler32.o \
zlib1.2.11/compress.o \
zlib1.2.11/crc32.o \
zlib1.2.11/deflate.o \
zlib1.2.11/infback.o \
zlib1.2.11/inffast.o \
zlib1.2.11/inflate.o \
zlib1.2.11/inftrees.o \
zlib1.2.11/trees.o \
zlib1.2.11/uncompr.o \
zlib1.2.11/zutil.o
zlib1.3.1/adler32.o \
zlib1.3.1/compress.o \
zlib1.3.1/crc32.o \
zlib1.3.1/deflate.o \
zlib1.3.1/infback.o \
zlib1.3.1/inffast.o \
zlib1.3.1/inflate.o \
zlib1.3.1/inftrees.o \
zlib1.3.1/trees.o \
zlib1.3.1/uncompr.o \
zlib1.3.1/zutil.o

ZIPPATCH_OBJ := \
src/patch/NewStream.o \
Expand Down
2 changes: 1 addition & 1 deletion builds/android_ndk_jni_mk/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
Lzma_Files += $(LOCAL_PATH)/../../lzma/Asm/arm64/LzmaDecOpt.S
endif

ZLIB_PATH := $(LOCAL_PATH)/../../zlib1.2.11
ZLIB_PATH := $(LOCAL_PATH)/../../zlib1.3.1
Zlib_Files := $(ZLIB_PATH)/crc32.c \
$(ZLIB_PATH)/deflate.c \
$(ZLIB_PATH)/inflate.c \
Expand Down
2 changes: 1 addition & 1 deletion builds/android_ndk_jni_mk/Android_DEBUG.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
Lzma_Files += $(LOCAL_PATH)/../../lzma/Asm/arm64/LzmaDecOpt.S
endif

ZLIB_PATH := $(LOCAL_PATH)/../../zlib1.2.11
ZLIB_PATH := $(LOCAL_PATH)/../../zlib1.3.1
Zlib_Files := $(ZLIB_PATH)/crc32.c \
$(ZLIB_PATH)/deflate.c \
$(ZLIB_PATH)/inflate.c \
Expand Down
20 changes: 10 additions & 10 deletions builds/codeblocks/ApkNormalized.cbp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,34 +58,34 @@
<Unit filename="../../src/normalized/normalized.cpp" />
<Unit filename="../../src/patch/OldStream.cpp" />
<Unit filename="../../src/patch/Zipper.cpp" />
<Unit filename="../../zlib1.2.11/adler32.c">
<Unit filename="../../zlib1.3.1/adler32.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/compress.c">
<Unit filename="../../zlib1.3.1/compress.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/crc32.c">
<Unit filename="../../zlib1.3.1/crc32.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/deflate.c">
<Unit filename="../../zlib1.3.1/deflate.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/inffast.c">
<Unit filename="../../zlib1.3.1/inffast.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/inflate.c">
<Unit filename="../../zlib1.3.1/inflate.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/inftrees.c">
<Unit filename="../../zlib1.3.1/inftrees.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/trees.c">
<Unit filename="../../zlib1.3.1/trees.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/uncompr.c">
<Unit filename="../../zlib1.3.1/uncompr.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/zutil.c">
<Unit filename="../../zlib1.3.1/zutil.c">
<Option compilerVar="CC" />
</Unit>
<Extensions>
Expand Down
22 changes: 11 additions & 11 deletions builds/codeblocks/ZipDiff.cbp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,37 +122,37 @@
<Unit filename="../../src/patch/ZipDiffData.cpp" />
<Unit filename="../../src/patch/Zipper.cpp" />
<Unit filename="../../src/zip_diff.cpp" />
<Unit filename="../../zlib1.2.11/adler32.c">
<Unit filename="../../zlib1.3.1/adler32.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/compress.c">
<Unit filename="../../zlib1.3.1/compress.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/crc32.c">
<Unit filename="../../zlib1.3.1/crc32.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/deflate.c">
<Unit filename="../../zlib1.3.1/deflate.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/infback.c">
<Unit filename="../../zlib1.3.1/infback.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/inffast.c">
<Unit filename="../../zlib1.3.1/inffast.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/inflate.c">
<Unit filename="../../zlib1.3.1/inflate.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/inftrees.c">
<Unit filename="../../zlib1.3.1/inftrees.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/trees.c">
<Unit filename="../../zlib1.3.1/trees.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/uncompr.c">
<Unit filename="../../zlib1.3.1/uncompr.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/zutil.c">
<Unit filename="../../zlib1.3.1/zutil.c">
<Option compilerVar="CC" />
</Unit>
<Extensions>
Expand Down
22 changes: 11 additions & 11 deletions builds/codeblocks/ZipPatch.cbp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,37 +72,37 @@
<Unit filename="../../src/patch/ZipDiffData.cpp" />
<Unit filename="../../src/patch/Zipper.cpp" />
<Unit filename="../../src/zip_patch.cpp" />
<Unit filename="../../zlib1.2.11/adler32.c">
<Unit filename="../../zlib1.3.1/adler32.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/compress.c">
<Unit filename="../../zlib1.3.1/compress.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/crc32.c">
<Unit filename="../../zlib1.3.1/crc32.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/deflate.c">
<Unit filename="../../zlib1.3.1/deflate.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/infback.c">
<Unit filename="../../zlib1.3.1/infback.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/inffast.c">
<Unit filename="../../zlib1.3.1/inffast.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/inflate.c">
<Unit filename="../../zlib1.3.1/inflate.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/inftrees.c">
<Unit filename="../../zlib1.3.1/inftrees.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/trees.c">
<Unit filename="../../zlib1.3.1/trees.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/uncompr.c">
<Unit filename="../../zlib1.3.1/uncompr.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../../zlib1.2.11/zutil.c">
<Unit filename="../../zlib1.3.1/zutil.c">
<Option compilerVar="CC" />
</Unit>
<Extensions>
Expand Down
20 changes: 10 additions & 10 deletions builds/vc/ApkNormalized.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@
<ClCompile Include="..\..\src\patch\OldStream.cpp" />
<ClCompile Include="..\..\src\patch\ZipDiffData.cpp" />
<ClCompile Include="..\..\src\patch\Zipper.cpp" />
<ClCompile Include="..\..\zlib1.2.11\adler32.c" />
<ClCompile Include="..\..\zlib1.2.11\compress.c" />
<ClCompile Include="..\..\zlib1.2.11\crc32.c" />
<ClCompile Include="..\..\zlib1.2.11\deflate.c" />
<ClCompile Include="..\..\zlib1.2.11\inffast.c" />
<ClCompile Include="..\..\zlib1.2.11\inflate.c" />
<ClCompile Include="..\..\zlib1.2.11\inftrees.c" />
<ClCompile Include="..\..\zlib1.2.11\trees.c" />
<ClCompile Include="..\..\zlib1.2.11\uncompr.c" />
<ClCompile Include="..\..\zlib1.2.11\zutil.c" />
<ClCompile Include="..\..\zlib1.3.1\adler32.c" />
<ClCompile Include="..\..\zlib1.3.1\compress.c" />
<ClCompile Include="..\..\zlib1.3.1\crc32.c" />
<ClCompile Include="..\..\zlib1.3.1\deflate.c" />
<ClCompile Include="..\..\zlib1.3.1\inffast.c" />
<ClCompile Include="..\..\zlib1.3.1\inflate.c" />
<ClCompile Include="..\..\zlib1.3.1\inftrees.c" />
<ClCompile Include="..\..\zlib1.3.1\trees.c" />
<ClCompile Include="..\..\zlib1.3.1\uncompr.c" />
<ClCompile Include="..\..\zlib1.3.1\zutil.c" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{B7BA5C32-5DC9-431D-BFD7-35ED679CD797}</ProjectGuid>
Expand Down
20 changes: 10 additions & 10 deletions builds/vc/ZipDiff.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,16 @@
<ClCompile Include="..\..\src\patch\ZipDiffData.cpp" />
<ClCompile Include="..\..\src\patch\Zipper.cpp" />
<ClCompile Include="..\..\src\zip_diff.cpp" />
<ClCompile Include="..\..\zlib1.2.11\adler32.c" />
<ClCompile Include="..\..\zlib1.2.11\compress.c" />
<ClCompile Include="..\..\zlib1.2.11\crc32.c" />
<ClCompile Include="..\..\zlib1.2.11\deflate.c" />
<ClCompile Include="..\..\zlib1.2.11\inffast.c" />
<ClCompile Include="..\..\zlib1.2.11\inflate.c" />
<ClCompile Include="..\..\zlib1.2.11\inftrees.c" />
<ClCompile Include="..\..\zlib1.2.11\trees.c" />
<ClCompile Include="..\..\zlib1.2.11\uncompr.c" />
<ClCompile Include="..\..\zlib1.2.11\zutil.c" />
<ClCompile Include="..\..\zlib1.3.1\adler32.c" />
<ClCompile Include="..\..\zlib1.3.1\compress.c" />
<ClCompile Include="..\..\zlib1.3.1\crc32.c" />
<ClCompile Include="..\..\zlib1.3.1\deflate.c" />
<ClCompile Include="..\..\zlib1.3.1\inffast.c" />
<ClCompile Include="..\..\zlib1.3.1\inflate.c" />
<ClCompile Include="..\..\zlib1.3.1\inftrees.c" />
<ClCompile Include="..\..\zlib1.3.1\trees.c" />
<ClCompile Include="..\..\zlib1.3.1\uncompr.c" />
<ClCompile Include="..\..\zlib1.3.1\zutil.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\HDiffPatch\builds\vc\lzma.vcxproj">
Expand Down
20 changes: 10 additions & 10 deletions builds/vc/ZipPatch.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@
<ClCompile Include="..\..\src\patch\ZipDiffData.cpp" />
<ClCompile Include="..\..\src\patch\Zipper.cpp" />
<ClCompile Include="..\..\src\zip_patch.cpp" />
<ClCompile Include="..\..\zlib1.2.11\adler32.c" />
<ClCompile Include="..\..\zlib1.2.11\compress.c" />
<ClCompile Include="..\..\zlib1.2.11\crc32.c" />
<ClCompile Include="..\..\zlib1.2.11\deflate.c" />
<ClCompile Include="..\..\zlib1.2.11\inffast.c" />
<ClCompile Include="..\..\zlib1.2.11\inflate.c" />
<ClCompile Include="..\..\zlib1.2.11\inftrees.c" />
<ClCompile Include="..\..\zlib1.2.11\trees.c" />
<ClCompile Include="..\..\zlib1.2.11\uncompr.c" />
<ClCompile Include="..\..\zlib1.2.11\zutil.c" />
<ClCompile Include="..\..\zlib1.3.1\adler32.c" />
<ClCompile Include="..\..\zlib1.3.1\compress.c" />
<ClCompile Include="..\..\zlib1.3.1\crc32.c" />
<ClCompile Include="..\..\zlib1.3.1\deflate.c" />
<ClCompile Include="..\..\zlib1.3.1\inffast.c" />
<ClCompile Include="..\..\zlib1.3.1\inflate.c" />
<ClCompile Include="..\..\zlib1.3.1\inftrees.c" />
<ClCompile Include="..\..\zlib1.3.1\trees.c" />
<ClCompile Include="..\..\zlib1.3.1\uncompr.c" />
<ClCompile Include="..\..\zlib1.3.1\zutil.c" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{69753A53-0320-4AF9-ADE7-A70F0C38358F}</ProjectGuid>
Expand Down
8 changes: 4 additions & 4 deletions builds/xcode/zlib.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
D688888E204688D30042E2B3 = {
isa = PBXGroup;
children = (
D6DA363820468A05009AEF45 /* zlib1.2.11 */,
D6DA363820468A05009AEF45 /* zlib1.3.1 */,
D6888898204688D30042E2B3 /* Products */,
);
sourceTree = "<group>";
Expand All @@ -58,7 +58,7 @@
name = Products;
sourceTree = "<group>";
};
D6DA363820468A05009AEF45 /* zlib1.2.11 */ = {
D6DA363820468A05009AEF45 /* zlib1.3.1 */ = {
isa = PBXGroup;
children = (
D6DA363B20468A05009AEF45 /* inflate.c */,
Expand All @@ -71,8 +71,8 @@
D6DA375820468A05009AEF45 /* inffast.c */,
D6DA375920468A05009AEF45 /* adler32.c */,
);
name = zlib1.2.11;
path = ../../zlib1.2.11;
name = zlib1.3.1;
path = ../../zlib1.3.1;
sourceTree = "<group>";
};
/* End PBXGroup section */
Expand Down
2 changes: 1 addition & 1 deletion src/patch/Zipper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ static const hdiff_TCompress* compressPlugin =&zipCompatibleCompressPlugin.ba
static hpatch_TDecompress* decompressPlugin=&zlibDecompressPlugin;

#if (_IS_NEED_FIXED_ZLIB_VERSION)
# define kNormalizedZlibVersion "1.2.11" //fixed zlib version
# define kNormalizedZlibVersion "1.3.1" //fixed zlib version
#endif

#define check(v) { if (!(v)) { assert(false); return false; } }
Expand Down
2 changes: 1 addition & 1 deletion src/patch/patch_types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

#if (!_IsNeedIncludeDefaultCompressHead)
# if (_IS_NEED_FIXED_ZLIB_VERSION)
# include "../../zlib1.2.11/zlib.h" // http://zlib.net/ https://github.com/madler/zlib
# include "../../zlib1.3.1/zlib.h" // http://zlib.net/ https://github.com/madler/zlib
# else
# include "zlib.h" //default by compiler environment
# endif
Expand Down
1 change: 0 additions & 1 deletion zlib1.2.11
Submodule zlib1.2.11 deleted from cacf7f
1 change: 1 addition & 0 deletions zlib1.3.1
Submodule zlib1.3.1 added at 51b7f2

0 comments on commit 14c6046

Please sign in to comment.