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

Merge pull request #85915 from akien-mga/3.x-fix-linux-arm64-theora-libvpx

Browse Source 
[3.x] SCons: Fix Linux arm64 build for theora and libvpx
This commit is contained in:
Rémi Verschelde
2023-12-11 20:02:03 +01:00
parent 6b28d93bbc 5b8a1314bd
commit 4bb21d3d83
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/webm/libvpx/SCsub
View File

@@ -228,7 +228,9 @@ elif env["platform"] != "windows": # Disable for Windows, yasm SIMD optimizatio
import platform import platform
is_x11_or_server_arm = (env["platform"] == "x11" or env["platform"] == "server") and ( is_x11_or_server_arm = (env["platform"] == "x11" or env["platform"] == "server") and (
platform.machine().startswith("arm") or platform.machine().startswith("aarch") platform.machine().startswith("arm")
or platform.machine().startswith("aarch")
or ("arch" in env and env["arch"].startswith("arm"))
) )
is_macos_x86 = env["platform"] == "osx" and ("arch" in env and (env["arch"] != "arm64")) is_macos_x86 = env["platform"] == "osx" and ("arch" in env and (env["arch"] != "arm64"))
is_ios_x86 = env["platform"] == "iphone" and ("arch" in env and env["arch"].startswith("x86")) is_ios_x86 = env["platform"] == "iphone" and ("arch" in env and env["arch"].startswith("x86"))

2
platform/x11/detect.py
View File

@@ -312,7 +312,7 @@ def configure(env):
env.ParseConfig("pkg-config theora theoradec --cflags --libs") env.ParseConfig("pkg-config theora theoradec --cflags --libs")
else: else:
list_of_x86 = ["x86_64", "x86", "i386", "i586"] list_of_x86 = ["x86_64", "x86", "i386", "i586"]
if any(platform.machine() in s for s in list_of_x86): if (env["arch"].startswith("x86") or env["arch"] == "") and any(platform.machine() in s for s in list_of_x86):
env["x86_libtheora_opt_gcc"] = True env["x86_libtheora_opt_gcc"] = True
if not env["builtin_libvpx"]: if not env["builtin_libvpx"]: