iqbalrifai/Aegisub
1
0
Fork 0
mirror of https://github.com/odrling/Aegisub synced 2025-04-11 22:56:02 +02:00
Code Issues Releases Wiki Activity

meson: fix luajit compiler args

Browse Source
This commit is contained in:
Ryan Lucia 2019-02-17 12:22:30 -05:00
parent d3c709a2ea
commit 631dad170f
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
subprojects/luajit/meson.build
View File

@ -7,25 +7,22 @@ system_deps = [
cc.find_library('m', required: false) cc.find_library('m', required: false)
] ]
system_deps_native = [
cc.find_library('dl', required: false, native: true),
cc.find_library('m', required: false, native: true)
]
add_project_arguments('-DLUAJIT_ENABLE_LUA52COMPAT', language: 'c') add_project_arguments('-DLUAJIT_ENABLE_LUA52COMPAT', language: 'c')
if host_machine.system() == 'linux' if host_machine.system() == 'linux'
add_project_arguments('-DLUAJIT_USE_LINUX', language: 'c') add_project_arguments('-DLUAJIT_OS=LUAJIT_OS_LINUX', language: 'c')
readline_dep = cc.find_library('readline') readline_dep = cc.find_library('readline')
ljvm_mode = 'elfasm' ljvm_mode = 'elfasm'
ljvm_bout = 'lj_vm.s' ljvm_bout = 'lj_vm.s'
elif host_machine.system() == 'darwin' elif host_machine.system() == 'darwin'
add_project_arguments(['-DLUAJIT_USE_MACOSX'], language: 'c') add_project_arguments(['-DLUAJIT_OS=LUAJIT_OS_OSX'], language: 'c')
readline_dep = cc.find_library('readline') readline_dep = cc.find_library('readline')
ljvm_mode = 'machasm' ljvm_mode = 'machasm'
ljvm_bout = 'lj_vm.s' ljvm_bout = 'lj_vm.s'
elif host_machine.system() == 'windows' elif host_machine.system() == 'windows'
add_project_arguments('-DLUAJIT_USE_WINDOWS', '-DWIN', add_project_arguments('-DLUAJIT_OS=LUAJIT_OS_WINDOWS', language: 'c')
'-malign-double', language: 'c') if cc.get_id() != 'msvc'
add_project_arguments('-malign-double', language: 'c')
endif
readline_dep = [] readline_dep = []
ljvm_mode = 'peobj' ljvm_mode = 'peobj'
ljvm_bout = 'lj_vm.o' ljvm_bout = 'lj_vm.o'

4
subprojects/luajit/src/host/meson.build
View File

@ -1,5 +1,5 @@
minilua = executable('minilua', 'minilua.c', minilua = executable('minilua', 'minilua.c',
dependencies: system_deps_native, dependencies: system_deps,
native: true) native: true)
if host_machine.cpu_family() == 'x86_64' if host_machine.cpu_family() == 'x86_64'
@ -45,6 +45,6 @@ buildvm_arch = custom_target('buildvm_arch.h',
output: 'buildvm_arch.h') output: 'buildvm_arch.h')
buildvm = executable('buildvm', buildvm_src, buildvm_arch, buildvm = executable('buildvm', buildvm_src, buildvm_arch,
dependencies: system_deps_native, dependencies: system_deps,
include_directories: src_inc, include_directories: src_inc,
native: true) native: true)