diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 75eaa114..717d8c9d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,56 +1,52 @@
name: ci
on: [push, pull_request]
jobs:
- make-build:
+ gcc-build:
strategy:
matrix:
platform: [ubuntu-latest, macos-latest]
runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v2
- - name: makeInit
+ - name: make_slef
run: |
- make LDEF=0 LZMA=0 ZSTD=0 MD5=0 -j
+ make CC=gcc CXX=g++ BSD=0 BZIP2=0 LDEF=0 LZMA=0 ZSTD=0 MD5=0 -j
make clean
- - name: makeNoAll
+ - name: make_0
+ run: |
+ make CC=gcc CXX=g++ DIR_DIFF=0 MT=0 VCD=0 ZLIB=0 BSD=0 BZIP2=0 LDEF=0 LZMA=0 ZSTD=0 MD5=0 -j
+ make clean
+ - name: make_all
run: |
git clone --depth=1 https://github.com/sisong/libmd5.git ../libmd5
git clone --depth=1 https://github.com/sisong/lzma.git ../lzma
git clone --depth=1 https://github.com/sisong/zstd.git ../zstd
- make DIR_DIFF=0 MT=0 BSD=0 VCD=0 ZLIB=0 LDEF=0 BZIP2=0 -j
- make clean
- - name: makeNoldef
- run: |
- make LDEF=0 -j
- make clean
- - name: makeAll
- run: |
+ git clone --depth=1 https://github.com/sisong/bzip2.git ../bzip2
git clone --depth=1 https://github.com/sisong/zlib.git ../zlib
git clone --depth=1 https://github.com/sisong/libdeflate.git ../libdeflate
- make -j
- make clean
- - name: makeByBz2Code
- run: |
- git clone --depth=1 https://github.com/sisong/bzip2.git ../bzip2
- make BZIP2=1 -j
+ make CC=gcc CXX=g++ BZIP2=1 -j
+ make BZIP2=1 clean
clang-build:
- runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ platform: [ubuntu-latest, macos-latest]
+ runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v2
- - name: installClang
+ - name: make_slefByClang
run: |
- sudo apt-get install -y llvm clang
- - name: initAndClone
+ make CL=1 BSD=0 BZIP2=0 LDEF=0 LZMA=0 ZSTD=0 MD5=0 -j
+ make clean
+ - name: make_allByClang
run: |
git clone --depth=1 https://github.com/sisong/libmd5.git ../libmd5
git clone --depth=1 https://github.com/sisong/lzma.git ../lzma
git clone --depth=1 https://github.com/sisong/zstd.git ../zstd
+ git clone --depth=1 https://github.com/sisong/bzip2.git ../bzip2
git clone --depth=1 https://github.com/sisong/zlib.git ../zlib
git clone --depth=1 https://github.com/sisong/libdeflate.git ../libdeflate
- - name: makeByClang
- run: |
- make CL=1 -j
+ make CL=1 BZIP2=1 -j
xcode-build:
runs-on: macos-latest
@@ -107,7 +103,10 @@ jobs:
ndk-version: r16b
- name: buildByAndroidNDK
run: |
- sudo apt install libncurses5
+ curl -O http://launchpadlibrarian.net/648013231/libtinfo5_6.4-2_amd64.deb
+ sudo dpkg -i libtinfo5_6.4-2_amd64.deb
+ curl -O http://launchpadlibrarian.net/648013227/libncurses5_6.4-2_amd64.deb
+ sudo dpkg -i libncurses5_6.4-2_amd64.deb
git clone --depth=1 https://github.com/sisong/lzma.git ../lzma
git clone --depth=1 https://github.com/sisong/bzip2.git ../bzip2
git clone --depth=1 https://github.com/sisong/zstd.git ../zstd
@@ -118,7 +117,7 @@ jobs:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- - uses: microsoft/setup-msbuild@v1.1
+ - uses: microsoft/setup-msbuild@v2
with:
msbuild-architecture: x64
- name: initAndClone
diff --git a/builds/vc/HDiffZ.vcxproj b/builds/vc/HDiffZ.vcxproj
index b6c40e98..595beeee 100644
--- a/builds/vc/HDiffZ.vcxproj
+++ b/builds/vc/HDiffZ.vcxproj
@@ -39,7 +39,7 @@
v4.0
ManagedCProj
hdiffz
- 10.0
+ 10.0.22621.0
diff --git a/builds/vc/HPatchZ.vcxproj b/builds/vc/HPatchZ.vcxproj
index 4973d414..0cfbecc3 100644
--- a/builds/vc/HPatchZ.vcxproj
+++ b/builds/vc/HPatchZ.vcxproj
@@ -39,7 +39,7 @@
v4.0
ManagedCProj
hpatchz
- 10.0
+ 10.0.22621.0
diff --git a/builds/vc/bzip2.vcxproj b/builds/vc/bzip2.vcxproj
index 9d5f2e09..ff258953 100644
--- a/builds/vc/bzip2.vcxproj
+++ b/builds/vc/bzip2.vcxproj
@@ -39,7 +39,7 @@
v4.0
ManagedCProj
bzip2
- 10.0
+ 10.0.22621.0
diff --git a/builds/vc/libdeflate.vcxproj b/builds/vc/libdeflate.vcxproj
index 21eeef23..3ff781c9 100644
--- a/builds/vc/libdeflate.vcxproj
+++ b/builds/vc/libdeflate.vcxproj
@@ -57,7 +57,7 @@
Win32Proj
{4ffa1879-e1a6-4b99-b9d1-3265f48dae0d}
libdeflate
- 10.0
+ 10.0.22621.0
diff --git a/builds/vc/lzma.vcxproj b/builds/vc/lzma.vcxproj
index 61b165dc..f1ec69f2 100644
--- a/builds/vc/lzma.vcxproj
+++ b/builds/vc/lzma.vcxproj
@@ -39,7 +39,7 @@
v4.0
ManagedCProj
lzma
- 10.0
+ 10.0.22621.0
diff --git a/builds/vc/testHashClash.vcxproj b/builds/vc/testHashClash.vcxproj
index 375e3eed..eee88f96 100644
--- a/builds/vc/testHashClash.vcxproj
+++ b/builds/vc/testHashClash.vcxproj
@@ -39,7 +39,7 @@
Win32Proj
{22873560-bda7-4915-8c7d-df7c380b4e55}
testHashClash
- 10.0
+ 10.0.22621.0
diff --git a/builds/vc/unitTest.vcxproj b/builds/vc/unitTest.vcxproj
index 97afe3f2..40f3b3b4 100644
--- a/builds/vc/unitTest.vcxproj
+++ b/builds/vc/unitTest.vcxproj
@@ -37,7 +37,7 @@
{EF32F56D-E3CF-4D51-BCCC-9184E13ED0AD}
unitTest
- 10.0
+ 10.0.22621.0
diff --git a/builds/vc/zlib.vcxproj b/builds/vc/zlib.vcxproj
index ea034985..9ac4f837 100644
--- a/builds/vc/zlib.vcxproj
+++ b/builds/vc/zlib.vcxproj
@@ -39,7 +39,7 @@
v4.0
ManagedCProj
zlib
- 10.0
+ 10.0.22621.0
diff --git a/builds/vc/zstd.vcxproj b/builds/vc/zstd.vcxproj
index bb07a50d..f1ecab89 100644
--- a/builds/vc/zstd.vcxproj
+++ b/builds/vc/zstd.vcxproj
@@ -37,7 +37,7 @@
{16415855-B9F4-4A5D-A096-C3380CFC6008}
zstd
- 10.0
+ 10.0.22621.0
diff --git a/libHDiffPatch/HDiff/private_diff/limit_mem_diff/bloom_filter.h b/libHDiffPatch/HDiff/private_diff/limit_mem_diff/bloom_filter.h
index c700f94c..487b781a 100644
--- a/libHDiffPatch/HDiff/private_diff/limit_mem_diff/bloom_filter.h
+++ b/libHDiffPatch/HDiff/private_diff/limit_mem_diff/bloom_filter.h
@@ -30,6 +30,7 @@
#define bloom_filter_h
#include //memset
#include
+#include //uint32_t
#include //std::runtime_error
#include "../../../../libParallel/parallel_channel.h"
#if (_IS_USED_MULTITHREAD)