mirror of https://github.com/odrling/Aegisub
Merge branches 'fixes' and 'bugfixes' into feature
This commit is contained in:
commit
1fde843630
|
@ -420,7 +420,7 @@ size_t IconvWrapper::DstStrLen(const char* str) {
|
||||||
bool IsConversionSupported(const char *src, const char *dst) {
|
bool IsConversionSupported(const char *src, const char *dst) {
|
||||||
iconv_t cd = iconv_open(dst, src);
|
iconv_t cd = iconv_open(dst, src);
|
||||||
bool supported = cd != iconv_invalid;
|
bool supported = cd != iconv_invalid;
|
||||||
iconv_close(cd);
|
if (supported) iconv_close(cd);
|
||||||
return supported;
|
return supported;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -431,7 +431,7 @@ if host_machine.system() == 'windows'
|
||||||
link_depends += manifest_file
|
link_depends += manifest_file
|
||||||
endif
|
endif
|
||||||
|
|
||||||
aegisub = executable('aegisub', aegisub_src, version_h, acconf,
|
aegisub = executable('aegisub', aegisub_src, version_h, acconf, resrc,
|
||||||
link_with: [libresrc, libluabins, libaegisub],
|
link_with: [libresrc, libluabins, libaegisub],
|
||||||
link_args: link_args,
|
link_args: link_args,
|
||||||
link_depends: link_depends,
|
link_depends: link_depends,
|
||||||
|
|
|
@ -1,7 +1,3 @@
|
||||||
minilua = executable('minilua', 'minilua.c',
|
|
||||||
dependencies: system_deps,
|
|
||||||
native: true)
|
|
||||||
|
|
||||||
cpu_family = host_machine.cpu_family()
|
cpu_family = host_machine.cpu_family()
|
||||||
if cpu_family == 'x86_64'
|
if cpu_family == 'x86_64'
|
||||||
dynasm_arch = 'x64'
|
dynasm_arch = 'x64'
|
||||||
|
@ -54,7 +50,7 @@ buildvm_arch = custom_target('buildvm_arch.h',
|
||||||
input: dynasm_dasc,
|
input: dynasm_dasc,
|
||||||
output: 'buildvm_arch.h')
|
output: 'buildvm_arch.h')
|
||||||
|
|
||||||
buildvm = executable('buildvm', buildvm_src, buildvm_arch,
|
buildvm = executable('buildvm', buildvm_src, buildvm_arch, luajit_h,
|
||||||
dependencies: system_deps,
|
dependencies: system_deps,
|
||||||
include_directories: src_inc,
|
include_directories: src_inc,
|
||||||
native: true)
|
native: true)
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
@VCS_CT@
|
|
@ -75,6 +75,23 @@ ljcore_src = files(
|
||||||
|
|
||||||
src_inc = include_directories('.')
|
src_inc = include_directories('.')
|
||||||
|
|
||||||
|
minilua = executable('minilua', 'host/minilua.c',
|
||||||
|
dependencies: system_deps,
|
||||||
|
native: true)
|
||||||
|
|
||||||
|
relver = vcs_tag(command: ['git', 'show', '-s', '--format=%ct'],
|
||||||
|
fallback: 'ROLLING',
|
||||||
|
input: 'luajit_relver.txt.in',
|
||||||
|
output: 'luajit_relver.txt',
|
||||||
|
replace_string: '@VCS_CT@')
|
||||||
|
|
||||||
|
luajit_rolling_h = files('luajit_rolling.h')
|
||||||
|
|
||||||
|
luajit_h = custom_target('luajit_h',
|
||||||
|
command: [minilua, '@INPUT@', '@OUTPUT@'],
|
||||||
|
input: ['host/genversion.lua', 'luajit_rolling.h', relver],
|
||||||
|
output: 'luajit.h')
|
||||||
|
|
||||||
subdir('host')
|
subdir('host')
|
||||||
|
|
||||||
hdrgen = [
|
hdrgen = [
|
||||||
|
@ -84,7 +101,8 @@ hdrgen = [
|
||||||
'recdef',
|
'recdef',
|
||||||
]
|
]
|
||||||
|
|
||||||
genheaders = []
|
genheaders = [luajit_h]
|
||||||
|
|
||||||
foreach h: hdrgen
|
foreach h: hdrgen
|
||||||
genheaders += custom_target(h,
|
genheaders += custom_target(h,
|
||||||
command: [buildvm, '-m', h, '-o', '@OUTPUT@', ljlib_src],
|
command: [buildvm, '-m', h, '-o', '@OUTPUT@', ljlib_src],
|
||||||
|
|
Loading…
Reference in New Issue