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

Fix spacing around colons in luajit subproject files

This commit is contained in:
Ryan Lucia 2019-01-30 18:33:39 -05:00
parent ddd6a4f289
commit 3b7724aab4
4 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/luabins/src/meson.build vendored
View File

@ -8,4 +8,4 @@ luabins_src = files(
'write.c',
)
libluabins = static_library('luabins', luabins_src, include_directories : luajit_inc)
libluabins = static_library('luabins', luabins_src, include_directories: luajit_inc)

22
vendor/luajit/meson.build vendored
View File

@ -1,31 +1,31 @@
project('luajit', 'c', version : '2.0.4', license : 'MIT')
project('luajit', 'c', version: '2.0.4', license: 'MIT')
cc = meson.get_compiler('c')
system_deps = [
cc.find_library('dl', required : false),
cc.find_library('m', required : false)
cc.find_library('dl', 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)
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'
add_project_arguments('-DLUAJIT_USE_LINUX', language : 'c')
add_project_arguments('-DLUAJIT_USE_LINUX', language: 'c')
readline_dep = cc.find_library('readline')
ljvm_mode = 'elfasm'
ljvm_bout = 'lj_vm.s'
elif host_machine.system() == 'darwin'
add_project_arguments(['-DLUAJIT_USE_MACOSX'], language : 'c')
add_project_arguments(['-DLUAJIT_USE_MACOSX'], language: 'c')
readline_dep = cc.find_library('readline')
ljvm_mode = 'machasm'
ljvm_bout = 'lj_vm.s'
elif host_machine.system() == 'windows'
add_project_arguments('-DLUAJIT_USE_WINDOWS', '-DWIN',
'-malign-double', language : 'c')
'-malign-double', language: 'c')
readline_dep = []
ljvm_mode = 'peobj'
ljvm_bout = 'lj_vm.o'
@ -38,5 +38,5 @@ incdir = include_directories('include')
subdir('src')
luajit_dep = declare_dependency(link_with : luajit_lib,
include_directories : incdir)
luajit_dep = declare_dependency(link_with: luajit_lib,
include_directories: incdir)

20
vendor/luajit/src/host/meson.build vendored
View File

@ -1,6 +1,6 @@
minilua = executable('minilua', 'minilua.c',
dependencies : system_deps_native,
native : true)
dependencies: system_deps_native,
native: true)
if host_machine.cpu_family() == 'x86_64'
dynasm_arch = 'x86'
@ -25,8 +25,8 @@ if host_machine.cpu_family() == 'x86'
checkdefs += ['__SSE2__', '1', ['-D', 'SSE']]
endif
foreach def : checkdefs
if cc.get_define(def[0], prefix : hpre) == def[1]
foreach def: checkdefs
if cc.get_define(def[0], prefix: hpre) == def[1]
dasm += def[2]
endif
endforeach
@ -40,11 +40,11 @@ buildvm_src = files(
)
buildvm_arch = custom_target('buildvm_arch.h',
command : dasm + ['-o', '@OUTPUT@', '@INPUT@'],
input : dynasm_dasc,
output : 'buildvm_arch.h')
command: dasm + ['-o', '@OUTPUT@', '@INPUT@'],
input: dynasm_dasc,
output: 'buildvm_arch.h')
buildvm = executable('buildvm', buildvm_src, buildvm_arch,
dependencies : system_deps_native,
include_directories : src_inc,
native : true)
dependencies: system_deps_native,
include_directories: src_inc,
native: true)

16
vendor/luajit/src/meson.build vendored
View File

@ -77,19 +77,19 @@ hdrgen = [
]
genheaders = []
foreach h : hdrgen
foreach h: hdrgen
genheaders += custom_target(h,
command : [buildvm, '-m', h, '-o', '@OUTPUT@', ljlib_src],
output : 'lj_@0@.h'.format(h))
command: [buildvm, '-m', h, '-o', '@OUTPUT@', ljlib_src],
output: 'lj_@0@.h'.format(h))
endforeach
genheaders += custom_target('folddef',
command : [buildvm, '-m', 'folddef', '-o', '@OUTPUT@', files('lj_opt_fold.c')],
output : 'lj_folddef.h')
command: [buildvm, '-m', 'folddef', '-o', '@OUTPUT@', files('lj_opt_fold.c')],
output: 'lj_folddef.h')
ljvm = custom_target(ljvm_bout,
command : [buildvm, '-m', ljvm_mode, '-o', '@OUTPUT@'],
output : ljvm_bout)
command: [buildvm, '-m', ljvm_mode, '-o', '@OUTPUT@'],
output: ljvm_bout)
luajit_lib = static_library('luajit', ljlib_src, ljcore_src, genheaders, ljvm,
dependencies : system_deps)
dependencies: system_deps)