From b60a6beadb88af4a02c79f942cdee898769b3ad6 Mon Sep 17 00:00:00 2001
From: phunkyfish <phunkyfish@gmail.com>
Date: Sat, 17 Aug 2024 08:09:06 +0100
Subject: [PATCH] Move windows zlib x64 to appropriately named directories

---
 CMakeLists.txt                                      |   6 +++---
 windows/{mingw64 => mingw64-x64}/include/zconf.h    |   0
 windows/{mingw64 => mingw64-x64}/include/zlib.h     |   0
 windows/{mingw64 => mingw64-x64}/lib/libz.a         | Bin
 .../{msvc2019 => msvc2019-x64}/zlib/include/zconf.h |   0
 .../{msvc2019 => msvc2019-x64}/zlib/include/zlib.h  |   0
 .../zlib/lib/zlibstatic.lib                         | Bin
 .../zlib/lib/zlibstaticd.lib                        | Bin
 .../{msvc2022 => msvc2022-x64}/zlib/include/zconf.h |   0
 .../{msvc2022 => msvc2022-x64}/zlib/include/zlib.h  |   0
 .../zlib/lib/zlibstatic.lib                         | Bin
 .../zlib/lib/zlibstaticd.lib                        | Bin
 12 files changed, 3 insertions(+), 3 deletions(-)
 rename windows/{mingw64 => mingw64-x64}/include/zconf.h (100%)
 rename windows/{mingw64 => mingw64-x64}/include/zlib.h (100%)
 rename windows/{mingw64 => mingw64-x64}/lib/libz.a (100%)
 rename windows/{msvc2019 => msvc2019-x64}/zlib/include/zconf.h (100%)
 rename windows/{msvc2019 => msvc2019-x64}/zlib/include/zlib.h (100%)
 rename windows/{msvc2019 => msvc2019-x64}/zlib/lib/zlibstatic.lib (100%)
 rename windows/{msvc2019 => msvc2019-x64}/zlib/lib/zlibstaticd.lib (100%)
 rename windows/{msvc2022 => msvc2022-x64}/zlib/include/zconf.h (100%)
 rename windows/{msvc2022 => msvc2022-x64}/zlib/include/zlib.h (100%)
 rename windows/{msvc2022 => msvc2022-x64}/zlib/lib/zlibstatic.lib (100%)
 rename windows/{msvc2022 => msvc2022-x64}/zlib/lib/zlibstaticd.lib (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e149cd..93fade9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,11 +41,11 @@ find_package(QT NAMES Qt6 REQUIRED COMPONENTS ${qtComponents})
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS ${qtComponents})
 
 if(MSVC_TOOLSET_VERSION EQUAL 142)
-    list(APPEND CMAKE_PREFIX_PATH "windows/msvc2019/zlib")
+    list(APPEND CMAKE_PREFIX_PATH "windows/msvc2019-x64/zlib")
 elseif(MSVC_TOOLSET_VERSION EQUAL 143)
-    list(APPEND CMAKE_PREFIX_PATH "windows/msvc2022/zlib")
+    list(APPEND CMAKE_PREFIX_PATH "windows/msvc2022-x64/zlib")
 elseif(MINGW)
-    list(APPEND CMAKE_PREFIX_PATH "windows/mingw64/zlib")
+    list(APPEND CMAKE_PREFIX_PATH "windows/mingw64-x64/zlib")
 endif()
 find_package(ZLIB REQUIRED)
 
diff --git a/windows/mingw64/include/zconf.h b/windows/mingw64-x64/include/zconf.h
similarity index 100%
rename from windows/mingw64/include/zconf.h
rename to windows/mingw64-x64/include/zconf.h
diff --git a/windows/mingw64/include/zlib.h b/windows/mingw64-x64/include/zlib.h
similarity index 100%
rename from windows/mingw64/include/zlib.h
rename to windows/mingw64-x64/include/zlib.h
diff --git a/windows/mingw64/lib/libz.a b/windows/mingw64-x64/lib/libz.a
similarity index 100%
rename from windows/mingw64/lib/libz.a
rename to windows/mingw64-x64/lib/libz.a
diff --git a/windows/msvc2019/zlib/include/zconf.h b/windows/msvc2019-x64/zlib/include/zconf.h
similarity index 100%
rename from windows/msvc2019/zlib/include/zconf.h
rename to windows/msvc2019-x64/zlib/include/zconf.h
diff --git a/windows/msvc2019/zlib/include/zlib.h b/windows/msvc2019-x64/zlib/include/zlib.h
similarity index 100%
rename from windows/msvc2019/zlib/include/zlib.h
rename to windows/msvc2019-x64/zlib/include/zlib.h
diff --git a/windows/msvc2019/zlib/lib/zlibstatic.lib b/windows/msvc2019-x64/zlib/lib/zlibstatic.lib
similarity index 100%
rename from windows/msvc2019/zlib/lib/zlibstatic.lib
rename to windows/msvc2019-x64/zlib/lib/zlibstatic.lib
diff --git a/windows/msvc2019/zlib/lib/zlibstaticd.lib b/windows/msvc2019-x64/zlib/lib/zlibstaticd.lib
similarity index 100%
rename from windows/msvc2019/zlib/lib/zlibstaticd.lib
rename to windows/msvc2019-x64/zlib/lib/zlibstaticd.lib
diff --git a/windows/msvc2022/zlib/include/zconf.h b/windows/msvc2022-x64/zlib/include/zconf.h
similarity index 100%
rename from windows/msvc2022/zlib/include/zconf.h
rename to windows/msvc2022-x64/zlib/include/zconf.h
diff --git a/windows/msvc2022/zlib/include/zlib.h b/windows/msvc2022-x64/zlib/include/zlib.h
similarity index 100%
rename from windows/msvc2022/zlib/include/zlib.h
rename to windows/msvc2022-x64/zlib/include/zlib.h
diff --git a/windows/msvc2022/zlib/lib/zlibstatic.lib b/windows/msvc2022-x64/zlib/lib/zlibstatic.lib
similarity index 100%
rename from windows/msvc2022/zlib/lib/zlibstatic.lib
rename to windows/msvc2022-x64/zlib/lib/zlibstatic.lib
diff --git a/windows/msvc2022/zlib/lib/zlibstaticd.lib b/windows/msvc2022-x64/zlib/lib/zlibstaticd.lib
similarity index 100%
rename from windows/msvc2022/zlib/lib/zlibstaticd.lib
rename to windows/msvc2022-x64/zlib/lib/zlibstaticd.lib