From f9b8a354649b6582a4e5e8ed44c3aa38b9d14a08 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 27 Sep 2021 09:24:08 +0400
Subject: [PATCH] Use zlib built with cmake on Windows

---
 external/minizip/CMakeLists.txt | 13 +++++--------
 external/zlib/CMakeLists.txt    | 14 ++++----------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/external/minizip/CMakeLists.txt b/external/minizip/CMakeLists.txt
index cf77a71..9936ca3 100644
--- a/external/minizip/CMakeLists.txt
+++ b/external/minizip/CMakeLists.txt
@@ -17,14 +17,6 @@ if (DESKTOP_APP_USE_PACKAGED)
     endif()
 endif()
 
-if (WIN32)
-    target_include_directories(external_minizip SYSTEM
-    INTERFACE
-        ${libs_loc}/zlib/contrib/minizip
-    )
-    return()
-endif()
-
 add_library(external_minizip_bundled STATIC)
 init_target(external_minizip_bundled "(external)")
 
@@ -46,6 +38,11 @@ PUBLIC
     ${minizip_loc}
 )
 
+target_link_libraries(external_minizip_bundled
+PRIVATE
+    desktop-app::external_zlib
+)
+
 target_link_libraries(external_minizip
 INTERFACE
     external_minizip_bundled
diff --git a/external/zlib/CMakeLists.txt b/external/zlib/CMakeLists.txt
index 796caa5..ccd4285 100644
--- a/external/zlib/CMakeLists.txt
+++ b/external/zlib/CMakeLists.txt
@@ -17,17 +17,11 @@ add_library(external_zlib STATIC IMPORTED GLOBAL)
 add_library(desktop-app::external_zlib ALIAS external_zlib)
 
 if (WIN32)
-    target_compile_definitions(external_zlib INTERFACE ZLIB_WINAPI)
-    target_include_directories(external_zlib SYSTEM INTERFACE ${libs_loc}/zlib)
-    if (build_win64)
-        set(zlib_config_folder x64)
-    else()
-        set(zlib_config_folder x86)
-    endif()
-    set(zlib_lib_loc ${libs_loc}/zlib/contrib/vstudio/vc14/${zlib_config_folder})
+    set(zlib_lib_loc ${libs_loc}/zlib)
+    target_include_directories(external_zlib SYSTEM INTERFACE ${zlib_lib_loc})
     set_target_properties(external_zlib PROPERTIES
-        IMPORTED_LOCATION "${zlib_lib_loc}/ZlibStatReleaseWithoutAsm/zlibstat.lib"
-        IMPORTED_LOCATION_DEBUG "${zlib_lib_loc}/ZlibStatDebug/zlibstat.lib"
+        IMPORTED_LOCATION "${zlib_lib_loc}/Release/zlibstatic.lib"
+        IMPORTED_LOCATION_DEBUG "${zlib_lib_loc}/Debug/zlibstaticd.lib"
     )
 elseif (APPLE)
     set_target_properties(external_zlib PROPERTIES