Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-04-14 23:58:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't try to include x86 assembly into non-x86 based platforms when cross compiling the x11 platform on x86.

Browse Source
This commit is contained in:
Relintai 2022-10-12 12:18:56 +02:00
parent 138ca10b6d
commit 6f4a778796
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform/x11/detect.py
View File

@ -289,8 +289,12 @@ 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"] == "":
env["x86_libtheora_opt_gcc"] = True if any(platform.machine() in s for s in list_of_x86):
env["x86_libtheora_opt_gcc"] = True
else:
if any(env["arch"] in s for s in list_of_x86):
env["x86_libtheora_opt_gcc"] = True
if not env["builtin_libvorbis"]: if not env["builtin_libvorbis"]:
env["builtin_libogg"] = False # Needed to link against system libvorbis env["builtin_libogg"] = False # Needed to link against system libvorbis