Skip to content

Commit

Permalink
Revert "Bump to lipzip/rel-1-3-0/51ff59da (#863)"
Browse files Browse the repository at this point in the history
This reverts commit fa9f62a.
  • Loading branch information
jonpryor authored Sep 18, 2017
1 parent 2bb0d91 commit cf07c6e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
[submodule "external/libzip"]
path = external/libzip
url = https://github.com/nih-at/libzip.git
branch = rel-1-3-0
branch = master
[submodule "external/LibZipSharp"]
path = external/LibZipSharp
url = https://github.com/grendello/LibZipSharp.git
Expand Down
4 changes: 2 additions & 2 deletions build-tools/libzip/libzip.projitems
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<ItemGroup>
<_LibZipTarget Include="host-Darwin" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Darwin:'))">
<CMake>cmake</CMake>
<CMakeFlags>-DCMAKE_OSX_ARCHITECTURES=&quot;i386;x86_64&quot; -DBUILD_SHARED_LIBS=ON</CMakeFlags>
<CMakeFlags>-DCMAKE_OSX_ARCHITECTURES=&quot;i386;x86_64&quot;</CMakeFlags>
<OutputLibrary>libzip.3.0.dylib</OutputLibrary>
<OutputLibraryPath>lib/libzip.3.0.dylib</OutputLibraryPath>
</_LibZipTarget>
<_LibZipTarget Include="host-Linux" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Linux:')) AND '$(_LinuxBuildLibZip)' == 'true' ">
<CMake>cmake</CMake>
<CMakeFlags>-DBUILD_SHARED_LIBS=ON</CMakeFlags>
<CMakeFlags></CMakeFlags>
<OutputLibrary>libzip.so</OutputLibrary>
<OutputLibraryPath>lib/libzip.so</OutputLibraryPath>
</_LibZipTarget>
Expand Down
2 changes: 1 addition & 1 deletion external/libzip
Submodule libzip updated 217 files

0 comments on commit cf07c6e

Please sign in to comment.