summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-08-27 18:46:54 +0200
committerGitHub <noreply@github.com>2022-08-27 18:46:54 +0200
commit35af2b0edd5f4e6ae7a1c3159a0eaae5d548889e (patch)
tree1ba9e83119af07e0c3931b1e7b946759b505d974 /core
parent09086b0bb08808de3c1eb257ed7a83b0a0a61f8f (diff)
parent8dab4a2aa3a078968e3df641ee607e1fb51ddfe2 (diff)
Merge pull request #64921 from bruvzg/win_arm
[Windows] Improve build environment detection, add support for Windows on ARM.
Diffstat (limited to 'core')
-rw-r--r--core/config/engine.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/config/engine.cpp b/core/config/engine.cpp
index 3efc0e822a..94db3612b4 100644
--- a/core/config/engine.cpp
+++ b/core/config/engine.cpp
@@ -191,11 +191,11 @@ String Engine::get_architecture_name() const {
#elif defined(__i386) || defined(__i386__) || defined(_M_IX86)
return "x86_32";
-#elif defined(__aarch64__) || defined(_M_ARM64)
+#elif defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
return "arm64";
-#elif defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7S__)
- return "armv7";
+#elif defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7S__) || defined(_M_ARM)
+ return "arm32";
#elif defined(__riscv)
#if __riscv_xlen == 8