From d0daae234af16d9b0310b88bfbc68e905fe86858 Mon Sep 17 00:00:00 2001
From: foxandfeature <foxandfeature@gmail.com>
Date: Mon, 2 Feb 2026 23:08:40 +0100
Subject: [PATCH] Fix MSVC arch detection for cross-compiling

---
 cmake/godotcpp.cmake | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/cmake/godotcpp.cmake b/cmake/godotcpp.cmake
index 5b6b0f4e4..7687524a5 100644
--- a/cmake/godotcpp.cmake
+++ b/cmake/godotcpp.cmake
@@ -64,6 +64,20 @@ function(godot_arch_name OUTVAR)
         endif()
     endif()
 
+    # Special case for MSVC cross-compilation
+    if(DEFINED CMAKE_VS_PLATFORM_NAME)
+        if(CMAKE_VS_PLATFORM_NAME STREQUAL "Win32")
+            set(${OUTVAR} "x86_32" PARENT_SCOPE)
+            return()
+        elseif(CMAKE_VS_PLATFORM_NAME STREQUAL "x64")
+            set(${OUTVAR} "x86_64" PARENT_SCOPE)
+            return()
+        elseif(CMAKE_VS_PLATFORM_NAME STREQUAL "ARM64")
+            set(${OUTVAR} "arm64" PARENT_SCOPE)
+            return()
+        endif()
+    endif()
+
     # Direct match early out.
     string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" ARCH)
     if(ARCH IN_LIST ARCH_LIST)