Fix arch detection for cross-compiling

Author: foxandfeature

cmake/godotcpp.cmake

@@ -64,6 +64,26 @@ 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()
+
+    # Special case for GNU -m32 builds
+    if(CMAKE_CXX_FLAGS MATCHES "-m32")
+        set(${OUTVAR} "x86_32" PARENT_SCOPE)
+        return()
+    endif()
+
     # Direct match early out.
     string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" ARCH)
     if(ARCH IN_LIST ARCH_LIST)
@@ -73,7 +93,7 @@ function(godot_arch_name OUTVAR)
 
     # Known aliases
     set(x86_64 "w64;amd64;x86-64")
-    set(arm32 "armv7;armv7-a")
+    set(arm32 "armv7;armv7-a;arm")
     set(arm64 "armv8;arm64v8;aarch64;armv8-a")
     set(rv64 "rv;riscv;riscv64")
     set(ppc32 "ppcle;ppc")