Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-10 06:03:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix arm64/Windows build.

Browse Source
This commit is contained in:
bruvzg 2024-04-30 13:50:04 +03:00
parent 64520fe674
commit 986d297ed3
No known key found for this signature in database
GPG Key ID: 7960FCF39844EC38
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/png/SCsub
View File

@ -39,7 +39,7 @@ if env["builtin_libpng"]:
if env["arch"].startswith("arm"): if env["arch"].startswith("arm"):
if env.msvc: # Can't compile assembly files with MSVC. 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: else:
env_neon = env_thirdparty.Clone() env_neon = env_thirdparty.Clone()
if "S_compiler" in env: if "S_compiler" in env:

5
modules/raycast/config.py
View File

@ -1,8 +1,9 @@
def can_build(env, platform): 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"]: if env["arch"] in ["x86_64", "arm64", "wasm32"]:
return True return True
# x86_32 only seems supported on Windows for now.
if env["arch"] == "x86_32" and platform == "windows": if env["arch"] == "x86_32" and platform == "windows":
return True return True
return False return False