diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-04-30 17:03:58 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-04-30 17:03:58 +0200 |
| commit | d282e4f0e6b6ebcf3bd6e05cd62f2a8fe1f9a238 (patch) | |
| tree | 15181f6f1cccdc23099c2266b606586e92b2188e | |
| parent | ec73f5631ccb1d8eb37d27ae564cb17df9753d5d (diff) | |
| parent | 986d297ed3c8e6a98c2cec2893f1e040f175738a (diff) | |
| download | redot-engine-d282e4f0e6b6ebcf3bd6e05cd62f2a8fe1f9a238.tar.gz | |
Merge pull request #91360 from bruvzg/arm_win_build
Fix arm64/Windows build.
| -rw-r--r-- | drivers/png/SCsub | 2 | ||||
| -rw-r--r-- | modules/raycast/config.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/png/SCsub b/drivers/png/SCsub index dd4777a19b..e38f3c4760 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 26329d813a..0fd35af528 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 |