upgrade to libzip 1.2.0

ctabin · Mar 1, 2017 · 5442bef · 5442bef
1 parent bf62a75
commit 5442bef
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@ SET(PACKAGE "libzippp")
 SET(VERSION "0.2")
 
 SET(ZLIB_PATH "lib/zlib-1.2.11" CACHE STRING "Path to zlib")
-SET(LIBZIP_PATH "lib/libzip-1.1.3" CACHE STRING "Path to libzip")
+SET(LIBZIP_PATH "lib/libzip-1.2.0" CACHE STRING "Path to libzip")
 
 FIND_PACKAGE(ZLIB REQUIRED)
 INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ Compilation has been tested with:
 
 Underlying libraries:
 - [ZLib](http://zlib.net) 1.2.11
-- [libzip](http://www.nih.at/libzip) 1.1.3
+- [libzip](http://www.nih.at/libzip) 1.2.0
 
 # Compilation
 
@@ -24,13 +24,13 @@ Underlying libraries:
 3. You may want to run the tests (optional): ```make tests```
 4. Now you just have to include the src folder in your include path and
   link against *libzippp.a* or *libzippp.so* (do not forget to also link 
-  against libzip libraries in *lib/libzip-1.1.3/lib/.libs/*).
+  against libzip libraries in *lib/libzip-1.2.0/lib/.libs/*).
   An example of compilation with g++:
 
 ```Shell
-g++ -I./lib/libzip-1.1.3/lib -I./src \
+g++ -I./lib/libzip-1.2.0/lib -I./src \
     main.cpp libzippp.a \
-    lib/libzip-1.1.3/lib/.libs/libzip.a \
+    lib/libzip-1.2.0/lib/.libs/libzip.a \
     lib/zlib-1.2.11/libz.a
 ```
 
@@ -42,15 +42,15 @@ g++ -I./lib/libzip-1.1.3/lib -I./src \
   <MSVS11>\Common7\Tools\VsDevCmd.bat
   ```
 
-1. Download [libzip](http://www.nih.at/libzip/libzip-1.1.3.tar.gz) and [zlib](http://zlib.net/zlib1211.zip) sources and extract them in the 'lib' folder.
+1. Download [libzip](http://www.nih.at/libzip/libzip-1.2.0.tar.gz) and [zlib](http://zlib.net/zlib1211.zip) sources and extract them in the 'lib' folder.
   You should end up with the following structure:
   ```
   libzippp/compile.bat
   libzippp/lib/zlib-1.2.11
-  libzippp/lib/libzip-1.1.3
+  libzippp/lib/libzip-1.2.0
   ```
 
-2. Extract the file *lib/libzip-1.1.3-windows-VS2012-patch.zip*. This file contains 
+2. Extract the file *lib/libzip-1.2.0-windows-VS2012-patch.zip*. This file contains 
   changes to be done in libzip in order to compile successfully with Visual 
   Studio 2012. Simply accept the erasing of the files.
 

diff --git a/compile.bat b/compile.bat
@@ -3,7 +3,7 @@
 
 SET vs2012devprompt=C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\Tools\VsDevCmd.bat
 SET zlib=lib\zlib-1.2.11
-SET libzip=lib\libzip-1.1.3
+SET libzip=lib\libzip-1.2.0
 
 if not exist "%zlib%" goto error_zlib_not_found
 if not exist "%libzip%" goto error_libzip_not_found