Merge pull request #73 from phunkyfish/add-arm64-windows-zlib

Add arm64 windows zlib for msvc
LibreELEC · Aug 18, 2024 · 888fe51 · 888fe51
2 parents 0323cd5 + 34cd17a
commit 888fe51
Show file tree

Hide file tree

Showing 18 changed files with 2,493 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -41,11 +41,17 @@ 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")
+    if(CMAKE_SYSTEM_PROCESSOR MATCHES "ARM64")
+        list(APPEND CMAKE_PREFIX_PATH "windows/msvc2019-arm64/zlib")
+    else()
+        list(APPEND CMAKE_PREFIX_PATH "windows/msvc2019-x64/zlib")
+    endif()
 elseif(MSVC_TOOLSET_VERSION EQUAL 143)
-    list(APPEND CMAKE_PREFIX_PATH "windows/msvc2022/zlib")
-elseif(MINGW)
-    list(APPEND CMAKE_PREFIX_PATH "windows/mingw64/zlib")
+    if(CMAKE_SYSTEM_PROCESSOR MATCHES "ARM64")
+        list(APPEND CMAKE_PREFIX_PATH "windows/msvc2022-arm64/zlib")
+    else()
+        list(APPEND CMAKE_PREFIX_PATH "windows/msvc2022-x64/zlib")
+    endif()
 endif()
 find_package(ZLIB REQUIRED)
 

diff --git a/windows/mingw64/lib/libz.a b/windows/mingw64/lib/libz.a
diff --git a/windows/msvc2019/zlib/include/zconf.h → windows/msvc2019-arm64/zlib/include/zconf.h b/windows/msvc2019/zlib/include/zconf.h → windows/msvc2019-arm64/zlib/include/zconf.h
diff --git a/windows/mingw64/include/zlib.h → windows/msvc2019-arm64/zlib/include/zlib.h b/windows/mingw64/include/zlib.h → windows/msvc2019-arm64/zlib/include/zlib.h
diff --git a/windows/msvc2019-arm64/zlib/lib/zlibstatic.lib b/windows/msvc2019-arm64/zlib/lib/zlibstatic.lib
diff --git a/windows/msvc2019-arm64/zlib/lib/zlibstaticd.lib b/windows/msvc2019-arm64/zlib/lib/zlibstaticd.lib