From 4d839d03b46918ae0db7cc7f0c7f04e8e6f2c62a Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Wed, 13 Apr 2016 00:13:05 -0700
Subject: [PATCH] All: Allow use of external minizip library

---
 CHANGES        |  1 +
 CMakeLists.txt | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 06fe26024..678f28579 100644
--- a/CHANGES
+++ b/CHANGES
@@ -28,6 +28,7 @@ Misc:
  - 3DS: Use blip_add_delta_fast for a small speed improvement
  - FFmpeg: Update dependencies on Ubuntu
  - OpenGL: Log shader compilation failure
+ - All: Allow use of external minizip library
 
 0.4.0: (2016-02-02)
 Features:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e9c6078c..a79fcd5a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,7 @@ set(USE_CLI_DEBUGGER ON CACHE BOOL "Whether or not to enable the CLI-mode ARM de
 set(USE_GDB_STUB ON CACHE BOOL "Whether or not to enable the GDB stub ARM debugger")
 set(USE_FFMPEG ON CACHE BOOL "Whether or not to enable FFmpeg support")
 set(USE_ZLIB ON CACHE BOOL "Whether or not to enable zlib support")
+set(USE_MINIZIP ON CACHE BOOL "Whether or not to enable external minizip support")
 set(USE_PNG ON CACHE BOOL "Whether or not to enable PNG support")
 set(USE_LIBZIP ON CACHE BOOL "Whether or not to enable LIBZIP support")
 set(USE_MAGICK ON CACHE BOOL "Whether or not to enable ImageMagick support")
@@ -305,6 +306,7 @@ set(WANT_LIBZIP ${USE_LIBZIP})
 
 find_feature(USE_FFMPEG "libavcodec;libavformat;libavresample;libavutil;libswscale")
 find_feature(USE_ZLIB "ZLIB")
+find_feature(USE_MINIZIP "minizip")
 find_feature(USE_PNG "PNG")
 find_feature(USE_LIBZIP "libzip")
 find_feature(USE_MAGICK "MagickWand")
@@ -429,6 +431,13 @@ if(USE_LIBZIP)
 	list(APPEND FEATURES LIBZIP)
 	list(APPEND VFS_SRC ${CMAKE_SOURCE_DIR}/src/util/vfs/vfs-zip.c)
 	set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libzip2")
+elseif(USE_MINIZIP)
+	include_directories(AFTER ${MINIZIP_INCLUDE_DIRS})
+	link_directories(${MINIZIP_LIBRARY_DIRS})
+	list(APPEND DEPENDENCY_LIB ${MINIZIP_LIBRARIES})
+	list(APPEND FEATURES MINIZIP)
+	list(APPEND VFS_SRC ${CMAKE_SOURCE_DIR}/src/util/vfs/vfs-zip.c)
+	set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libminizip1")
 elseif(USE_ZLIB)
 	list(APPEND VFS_SRC ${CMAKE_SOURCE_DIR}/src/util/vfs/vfs-zip.c
 		${CMAKE_SOURCE_DIR}/src/third-party/zlib/contrib/minizip/ioapi.c
@@ -687,8 +696,10 @@ else()
 endif()
 if(USE_LIBZIP)
 	set(SUMMARY_ZIP libzip)
+elseif(USE_MINIZIP)
+	set(SUMMARY_ZIP "minizip (external)")
 elseif(USE_ZLIB)
-	set(SUMMARY_ZIP minizip)
+	set(SUMMARY_ZIP "minizip (included)")
 else()
 	set(SUMMARY_ZIP OFF)
 endif()