Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix arm64/Windows build. #91360

Merged
merged 1 commit into from
Apr 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drivers/png/SCsub
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 3 additions & 2 deletions modules/raycast/config.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading