From 3c41b68d518eb26bf679224c2a3e4dcbec425c0f Mon Sep 17 00:00:00 2001 From: Fabrice de Gans Date: Tue, 27 Dec 2022 11:14:11 -0800 Subject: [PATCH] Fix the Windows ARM64 build * Remove arch constraints in a CMake block. * Convert some tab identation to spaces. --- cmake/Architecture.cmake | 6 ++++-- src/wx/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cmake/Architecture.cmake b/cmake/Architecture.cmake index 9fa6a7b4..3c69bba5 100644 --- a/cmake/Architecture.cmake +++ b/cmake/Architecture.cmake @@ -27,13 +27,13 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "[xX]86|i[3-9]86|[aA][mM][dD]64") set(ASM_DEFAULT ON) set(X86_32 ON) set(X86 ON) - set(WINARCH x86) + set(WINARCH x86) set(ARCH_NAME x86_32) elseif(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8) set(AMD64 ON) set(X64 ON) set(X86_64 ON) - set(WINARCH x64) + set(WINARCH x64) set(ARCH_NAME x86_64) endif() @@ -47,7 +47,9 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "[xX]86|i[3-9]86|[aA][mM][dD]64") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "[aA][aA][rR][cC][hH]|[aA][rR][mM]") if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 4) # 32 bit set(ARCH_NAME arm32) + set(WINARCH arm) elseif(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8) set(ARCH_NAME arm64) + set(WINARCH arm64) endif() endif() diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt index 2656f7ba..e25780e8 100644 --- a/src/wx/CMakeLists.txt +++ b/src/wx/CMakeLists.txt @@ -109,7 +109,7 @@ endif() # on VS with vcpkg we can't use FindwxWidgets, we have to set everything up # manually because the package is broken -if(WIN32 AND CMAKE_TOOLCHAIN_FILE MATCHES vcpkg AND (X86_32 OR X86_64)) +if(WIN32 AND CMAKE_TOOLCHAIN_FILE MATCHES vcpkg) # set up wxwidgets stuff set(libtype u) unset(arch_suffix)