Move windows zlib x64 to appropriately named directories

LibreELEC · Aug 17, 2024 · b60a6be · b60a6be
1 parent 0323cd5
commit b60a6be
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 3 deletions.
diff --git 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 → windows/mingw64-x64/include/zconf.h b/windows/mingw64/include/zconf.h → windows/mingw64-x64/include/zconf.h
diff --git a/windows/mingw64/include/zlib.h → windows/mingw64-x64/include/zlib.h b/windows/mingw64/include/zlib.h → windows/mingw64-x64/include/zlib.h
diff --git a/windows/mingw64/lib/libz.a → windows/mingw64-x64/lib/libz.a b/windows/mingw64/lib/libz.a → windows/mingw64-x64/lib/libz.a
diff --git a/windows/msvc2019/zlib/include/zconf.h → windows/msvc2019-x64/zlib/include/zconf.h b/windows/msvc2019/zlib/include/zconf.h → windows/msvc2019-x64/zlib/include/zconf.h
diff --git a/windows/msvc2019/zlib/include/zlib.h → windows/msvc2019-x64/zlib/include/zlib.h b/windows/msvc2019/zlib/include/zlib.h → windows/msvc2019-x64/zlib/include/zlib.h
diff --git a/windows/msvc2019/zlib/lib/zlibstatic.lib → windows/msvc2019-x64/zlib/lib/zlibstatic.lib b/windows/msvc2019/zlib/lib/zlibstatic.lib → windows/msvc2019-x64/zlib/lib/zlibstatic.lib
diff --git a/windows/msvc2019/zlib/lib/zlibstaticd.lib → ...ows/msvc2019-x64/zlib/lib/zlibstaticd.lib b/windows/msvc2019/zlib/lib/zlibstaticd.lib → ...ows/msvc2019-x64/zlib/lib/zlibstaticd.lib
diff --git a/windows/msvc2022/zlib/include/zconf.h → windows/msvc2022-x64/zlib/include/zconf.h b/windows/msvc2022/zlib/include/zconf.h → windows/msvc2022-x64/zlib/include/zconf.h
diff --git a/windows/msvc2022/zlib/include/zlib.h → windows/msvc2022-x64/zlib/include/zlib.h b/windows/msvc2022/zlib/include/zlib.h → windows/msvc2022-x64/zlib/include/zlib.h
diff --git a/windows/msvc2022/zlib/lib/zlibstatic.lib → windows/msvc2022-x64/zlib/lib/zlibstatic.lib b/windows/msvc2022/zlib/lib/zlibstatic.lib → windows/msvc2022-x64/zlib/lib/zlibstatic.lib
diff --git a/windows/msvc2022/zlib/lib/zlibstaticd.lib → ...ows/msvc2022-x64/zlib/lib/zlibstaticd.lib b/windows/msvc2022/zlib/lib/zlibstaticd.lib → ...ows/msvc2022-x64/zlib/lib/zlibstaticd.lib