From 73ad926880e5b47a3240d39f8f7bc934951b53ff Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 30 Jan 2021 09:12:13 -0500 Subject: [PATCH] meson: define CSRI_NO_EXPORT earlier in setup --- meson.build | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 7b8ecb7ab..303266dc3 100644 --- a/meson.build +++ b/meson.build @@ -12,6 +12,12 @@ if host_machine.system() == 'windows' 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 endif if host_machine.system() == 'windows' @@ -41,11 +47,7 @@ docdir = prefix / 'doc' dataroot = datadir / 'aegisub' if host_machine.system() == 'windows' - 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 endif # MSVC sets this automatically with -MDd, but it has a different meaning on other platforms