From bf53ee96e537c8805e8d4640d3d4b5dd033fe074 Mon Sep 17 00:00:00 2001 From: Anthony Roberts Date: Thu, 13 Feb 2025 16:51:19 +0100 Subject: [PATCH 1/2] Windows ARM64: 4.4 Library Updates Updates the prebuilt libs to the versions used in 4.4 Also adds a check to ensure users are using at least the version of VS2022, that was used to compile the libraries Pull Request: https://projects.blender.org/blender/blender/pulls/134405 --- build_files/cmake/platform/platform_win32.cmake | 5 +++++ lib/windows_arm64 | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 43cddc32b8c..443343a4e18 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -58,6 +58,11 @@ else() endif() endif() +set(WINDOWS_ARM64_MIN_VSCMD_VER 17.12.3) +if(CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64" AND $ENV{VSCMD_VER} VERSION_LESS WINDOWS_ARM64_MIN_VSCMD_VER) + message(FATAL_ERROR "Windows ARM64 requires VS2022 version ${WINDOWS_ARM64_MIN_VSCMD_VER} or greater - please update your VS2022 install!") +endif() + if(WITH_BLENDER AND NOT WITH_PYTHON_MODULE) set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT blender) endif() diff --git a/lib/windows_arm64 b/lib/windows_arm64 index eefd189a14d..6d3b1f5ed94 160000 --- a/lib/windows_arm64 +++ b/lib/windows_arm64 @@ -1 +1 @@ -Subproject commit eefd189a14dd38e2b338ae05d2b214b7f7fb668f +Subproject commit 6d3b1f5ed94dc43ee7c5e1aa2b7192f4199c5195 From ace957a1246ee782e1cfa62eb838f4c2001f704c Mon Sep 17 00:00:00 2001 From: Anthony Roberts Date: Thu, 13 Feb 2025 17:42:49 +0100 Subject: [PATCH 2/2] Windows: Guard VsDevCmd env var check to ARM64 only This is a "quick fix" guard check to unbreak things - I'll put a proper checking mechanism in later that checks if it's undefined etc Pull Request: https://projects.blender.org/blender/blender/pulls/134512 --- build_files/cmake/platform/platform_win32.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 443343a4e18..af00f6670f5 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -59,8 +59,10 @@ else() endif() set(WINDOWS_ARM64_MIN_VSCMD_VER 17.12.3) -if(CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64" AND $ENV{VSCMD_VER} VERSION_LESS WINDOWS_ARM64_MIN_VSCMD_VER) - message(FATAL_ERROR "Windows ARM64 requires VS2022 version ${WINDOWS_ARM64_MIN_VSCMD_VER} or greater - please update your VS2022 install!") +if(CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64") + if($ENV{VSCMD_VER} VERSION_LESS WINDOWS_ARM64_MIN_VSCMD_VER) + message(FATAL_ERROR "Windows ARM64 requires VS2022 version ${WINDOWS_ARM64_MIN_VSCMD_VER} or greater - please update your VS2022 install!") + endif() endif() if(WITH_BLENDER AND NOT WITH_PYTHON_MODULE)