Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 11:32:13 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #91360 from bruvzg/arm_win_build

Browse Source 
Fix arm64/Windows build.
This commit is contained in:
Rémi Verschelde 2024-04-30 17:03:58 +02:00
commit d282e4f0e6
No known key found for this signature in database
GPG Key ID: C3336907360768E1
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.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:

5
modules/raycast/config.py
View File

@ -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