Skip to content

Commit d282e4f

Browse files
committed
Merge pull request godotengine#91360 from bruvzg/arm_win_build
Fix arm64/Windows build.
2 parents ec73f56 + 986d297 commit d282e4f

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

drivers/png/SCsub

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ if env["builtin_libpng"]:
3939

4040
if env["arch"].startswith("arm"):
4141
if env.msvc: # Can't compile assembly files with MSVC.
42-
env_thirdparty.Append(CPPDEFINES=[("PNG_ARM_NEON_OPT"), 0])
42+
env_thirdparty.Append(CPPDEFINES=[("PNG_ARM_NEON_OPT", 0)])
4343
else:
4444
env_neon = env_thirdparty.Clone()
4545
if "S_compiler" in env:

modules/raycast/config.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
def can_build(env, platform):
2-
# Supported architectures depend on the Embree library.
2+
# Supported architectures and platforms depend on the Embree library.
3+
if env["arch"] == "arm64" and platform == "windows":
4+
return False
35
if env["arch"] in ["x86_64", "arm64", "wasm32"]:
46
return True
5-
# x86_32 only seems supported on Windows for now.
67
if env["arch"] == "x86_32" and platform == "windows":
78
return True
89
return False

0 commit comments

Comments
 (0)