From 26207038c94a7c8542a4466c07c6ba8de8f01c5e Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Mon, 9 Sep 2024 11:07:19 +0000 Subject: [PATCH] Update WinSparkle to 0.8.1 and add ARM64 Update the included WinSparkle dll to 0.8.1 and add support for using the ARM64 WinSparkle dll as well. Signed-off-by: Rafael Kitover --- cmake/Architecture.cmake | 2 ++ src/wx/CMakeLists.txt | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cmake/Architecture.cmake b/cmake/Architecture.cmake index a639c7a2..df9d2b04 100644 --- a/cmake/Architecture.cmake +++ b/cmake/Architecture.cmake @@ -56,9 +56,11 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "[xX]86|i[3-9]86|[aA][mM][dD]64") endif() elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "[aA][aA][rR][cC][hH]|[aA][rR][mM]") if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 4) # 32 bit + set(ARM32 ON) set(ARCH_NAME arm32) set(WINARCH arm) elseif(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8) + set(ARM64 ON) set(ARCH_NAME arm64) set(WINARCH arm64) endif() diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt index 054081be..0052a7bc 100644 --- a/src/wx/CMakeLists.txt +++ b/src/wx/CMakeLists.txt @@ -655,9 +655,9 @@ if(APPLE) set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks") endif() -if(WIN32 AND (X86_64 OR X86_32) AND ENABLE_ONLINEUPDATES) +if(WIN32 AND (X86_64 OR ARM64 OR X86_32) AND ENABLE_ONLINEUPDATES) if(NOT DEFINED WINSPARKLE_BIN_RELEASE_DIR) - set(WINSPARKLE_BIN_RELEASE_DIR ${CMAKE_SOURCE_DIR}/dependencies/WinSparkle-0.6.0) + set(WINSPARKLE_BIN_RELEASE_DIR ${CMAKE_SOURCE_DIR}/dependencies/WinSparkle-0.8.1) endif() target_include_directories( @@ -666,9 +666,11 @@ if(WIN32 AND (X86_64 OR X86_32) AND ENABLE_ONLINEUPDATES) ) if(X86_64) - set(WINSPARKLE_DLL ${CMAKE_SOURCE_DIR}/dependencies/WinSparkle-0.6.0/x64/Release/WinSparkle.dll) - else() - set(WINSPARKLE_DLL ${CMAKE_SOURCE_DIR}/dependencies/WinSparkle-0.6.0/Release/WinSparkle.dll) + set(WINSPARKLE_DLL ${WINSPARKLE_BIN_RELEASE_DIR}/x64/Release/WinSparkle.dll) + elseif(ARM64) + set(WINSPARKLE_DLL ${WINSPARKLE_BIN_RELEASE_DIR}/ARM64/Release/WinSparkle.dll) + elseif(X86_32) + set(WINSPARKLE_DLL ${WINSPARKLE_BIN_RELEASE_DIR}/Release/WinSparkle.dll) endif() configure_file(autoupdater/wxmsw/winsparkle-path.h.in ${CMAKE_BINARY_DIR}/winsparkle-path.h)