From 986d297ed3c8e6a98c2cec2893f1e040f175738a Mon Sep 17 00:00:00 2001 From: bruvzg <7645683+bruvzg@users.noreply.github.com> Date: Tue, 30 Apr 2024 13:50:04 +0300 Subject: [PATCH] Fix arm64/Windows build. --- drivers/png/SCsub | 2 +- modules/raycast/config.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/png/SCsub b/drivers/png/SCsub index dd4777a19b4..e38f3c47606 100644 --- a/drivers/png/SCsub +++ b/drivers/png/SCsub @@ -39,7 +39,7 @@ if env["builtin_libpng"]: if env["arch"].startswith("arm"): if env.msvc: # Can't compile assembly files with MSVC. - env_thirdparty.Append(CPPDEFINES=[("PNG_ARM_NEON_OPT"), 0]) + env_thirdparty.Append(CPPDEFINES=[("PNG_ARM_NEON_OPT", 0)]) else: env_neon = env_thirdparty.Clone() if "S_compiler" in env: diff --git a/modules/raycast/config.py b/modules/raycast/config.py index 26329d813af..0fd35af528f 100644 --- a/modules/raycast/config.py +++ b/modules/raycast/config.py @@ -1,8 +1,9 @@ def can_build(env, platform): - # Supported architectures depend on the Embree library. + # Supported architectures and platforms depend on the Embree library. + if env["arch"] == "arm64" and platform == "windows": + return False if env["arch"] in ["x86_64", "arm64", "wasm32"]: return True - # x86_32 only seems supported on Windows for now. if env["arch"] == "x86_32" and platform == "windows": return True return False