Merge branch 'bugfixes' into feature
This commit is contained in:
commit
752a14cc25
|
@ -418,7 +418,10 @@ subdir('libaegisub')
|
||||||
subdir('packages')
|
subdir('packages')
|
||||||
subdir('po')
|
subdir('po')
|
||||||
subdir('src')
|
subdir('src')
|
||||||
subdir('tests')
|
|
||||||
|
if not meson.is_cross_build()
|
||||||
|
subdir('tests')
|
||||||
|
endif
|
||||||
|
|
||||||
aegisub_cpp_pch = ['src/include/agi_pre.h']
|
aegisub_cpp_pch = ['src/include/agi_pre.h']
|
||||||
aegisub_c_pch = ['src/include/agi_pre_c.h']
|
aegisub_c_pch = ['src/include/agi_pre_c.h']
|
||||||
|
|
|
@ -7,19 +7,21 @@ system_deps = [
|
||||||
cc.find_library('m', required: false)
|
cc.find_library('m', required: false)
|
||||||
]
|
]
|
||||||
|
|
||||||
|
# get architecture id for the host machine so it can be set when compiling buildvm natively
|
||||||
|
lj_target_id = cc.get_define('LUAJIT_TARGET', prefix: '#include "@0@/src/lj_arch.h"'.format(meson.current_source_dir()))
|
||||||
|
add_project_arguments('-DLUAJIT_TARGET=@0@'.format(lj_target_id), language: 'c', native: true)
|
||||||
|
|
||||||
# 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', '-DENDIAN_LE', language: 'c', native: true)
|
add_project_arguments('-DLUAJIT_ENABLE_LUA52COMPAT', '-DENDIAN_LE', language: 'c', native: true)
|
||||||
add_project_arguments('-DLUAJIT_ENABLE_LUA52COMPAT', '-DENDIAN_LE', language: 'c', native: false)
|
add_project_arguments('-DLUAJIT_ENABLE_LUA52COMPAT', '-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)
|
||||||
add_project_arguments('-DLUAJIT_UNWIND_EXTERNAL', language: 'c', native: false)
|
add_project_arguments('-DLUAJIT_UNWIND_EXTERNAL', language: 'c', native: false)
|
||||||
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_OS=LUAJIT_OS_OSX', language: 'c', native: true)
|
add_project_arguments('-DLUAJIT_OS=LUAJIT_OS_OSX', language: 'c', native: true)
|
||||||
add_project_arguments('-DLUAJIT_UNWIND_EXTERNAL', language: 'c', native: false)
|
add_project_arguments('-DLUAJIT_UNWIND_EXTERNAL', language: 'c', native: false)
|
||||||
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'
|
||||||
|
@ -27,11 +29,9 @@ elif host_machine.system() == 'windows'
|
||||||
if cc.get_id() != 'msvc'
|
if cc.get_id() != 'msvc'
|
||||||
add_project_arguments('-malign-double', language: 'c', native: true)
|
add_project_arguments('-malign-double', language: 'c', native: true)
|
||||||
endif
|
endif
|
||||||
readline_dep = []
|
|
||||||
ljvm_mode = 'peobj'
|
ljvm_mode = 'peobj'
|
||||||
ljvm_bout = 'lj_vm.o'
|
ljvm_bout = 'lj_vm.o'
|
||||||
else
|
else
|
||||||
readline_dep = []
|
|
||||||
error('Unsupported platform')
|
error('Unsupported platform')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue