iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

meson: fix luajit 64-bit builds 

Upstream defines ENDIAN_LE or ENDIAN_BE always, so assume little endian. x86_64 defaulting to x86 seems to just be a mistake
This commit is contained in:
Ryan Lucia 2021-01-30 16:21:22 -05:00
parent ef64307ba1
commit 84beba20cb
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
subprojects/packagefiles/luajit/meson.build
View File

@ -10,6 +10,8 @@ system_deps = [
# compat flag is needed for both the buildvm code generator (compiled natively) and luajit itself # compat flag is needed for both the buildvm code generator (compiled natively) and luajit itself
add_project_arguments('-DLUAJIT_ENABLE_LUA52COMPAT', language: 'c', native: true) add_project_arguments('-DLUAJIT_ENABLE_LUA52COMPAT', language: 'c', native: true)
add_project_arguments('-DLUAJIT_ENABLE_LUA52COMPAT', language: 'c', native: false) add_project_arguments('-DLUAJIT_ENABLE_LUA52COMPAT', language: 'c', native: false)
add_project_arguments('-DENDIAN_LE', language: 'c', native: true)
add_project_arguments('-DENDIAN_LE', language: 'c', native: false)
if host_machine.system() == 'linux' if host_machine.system() == 'linux'
add_project_arguments('-DLUAJIT_OS=LUAJIT_OS_LINUX', language: 'c', native: true) add_project_arguments('-DLUAJIT_OS=LUAJIT_OS_LINUX', language: 'c', native: true)
readline_dep = cc.find_library('readline') readline_dep = cc.find_library('readline')

2
subprojects/packagefiles/luajit/src/host/meson.build
View File

@ -3,7 +3,7 @@ minilua = executable('minilua', 'minilua.c',
native: true) native: true)
if host_machine.cpu_family() == 'x86_64' if host_machine.cpu_family() == 'x86_64'
dynasm_arch = 'x86' dynasm_arch = 'x64'
else else
dynasm_arch = host_machine.cpu_family() dynasm_arch = host_machine.cpu_family()
endif endif