meson: reorder nasm download to work with global args
This commit is contained in:
parent
248785d7ad
commit
b72f02b9f2
1 changed files with 6 additions and 6 deletions
12
meson.build
12
meson.build
|
@ -7,17 +7,17 @@ project('Aegisub', ['c', 'cpp'],
|
|||
cmake = import('cmake')
|
||||
|
||||
if host_machine.system() == 'windows'
|
||||
sys_nasm = find_program('nasm', required: false)
|
||||
if not sys_nasm.found()
|
||||
nasm = subproject('nasm').get_variable('nasm')
|
||||
meson.override_find_program('nasm', nasm)
|
||||
endif
|
||||
|
||||
add_project_arguments('-DNOMINMAX', '-D_WIN32_WINNT=0x0601', language: 'cpp')
|
||||
|
||||
if not get_option('csri').disabled()
|
||||
add_global_arguments('-DCSRI_NO_EXPORT', language: 'c')
|
||||
endif
|
||||
|
||||
sys_nasm = find_program('nasm', required: false)
|
||||
if not sys_nasm.found()
|
||||
nasm = subproject('nasm').get_variable('nasm')
|
||||
meson.override_find_program('nasm', nasm)
|
||||
endif
|
||||
endif
|
||||
|
||||
if host_machine.system() == 'windows'
|
||||
|
|
Loading…
Reference in a new issue