diff --git a/.gitmodules b/.gitmodules index 1751d129dcc..2ed7943d272 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,7 +20,7 @@ [submodule "external/libzip"] path = external/libzip url = https://github.com/nih-at/libzip.git - branch = master + branch = rel-1-3-0 [submodule "external/LibZipSharp"] path = external/LibZipSharp url = https://github.com/grendello/LibZipSharp.git diff --git a/build-tools/libzip/libzip.projitems b/build-tools/libzip/libzip.projitems index 7582776ebd8..9c85ac8c027 100644 --- a/build-tools/libzip/libzip.projitems +++ b/build-tools/libzip/libzip.projitems @@ -3,13 +3,13 @@ <_LibZipTarget Include="host-Darwin" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Darwin:'))"> cmake - -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" + -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" -DBUILD_SHARED_LIBS=ON libzip.3.0.dylib lib/libzip.3.0.dylib <_LibZipTarget Include="host-Linux" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Linux:')) AND '$(_LinuxBuildLibZip)' == 'true' "> cmake - + -DBUILD_SHARED_LIBS=ON libzip.so lib/libzip.so diff --git a/external/libzip b/external/libzip index 1d8b1ac4d20..51ff59da3a8 160000 --- a/external/libzip +++ b/external/libzip @@ -1 +1 @@ -Subproject commit 1d8b1ac4d20b8ef8d3f5d496dabebaa0ff9019ff +Subproject commit 51ff59da3a8c7d3934e23aed70eb0347234a14c9