From b72f02b9f286690a8e1ed5848368146f5311caad Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 30 Jan 2021 12:11:34 -0500 Subject: [PATCH] meson: reorder nasm download to work with global args --- meson.build | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 8b511e94c..9b361f50f 100644 --- a/meson.build +++ b/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'