From 3e97e1f16b4ebe5516c0afc092122a224b5c13eb Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Wed, 4 Sep 2024 20:58:30 -0700 Subject: [PATCH 1/2] meson: Rename meson_options.txt to meson.options The new name is a bit cleaner and is supported by all versions of Meson that we support. --- meson_options.txt => meson.options | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename meson_options.txt => meson.options (100%) diff --git a/meson_options.txt b/meson.options similarity index 100% rename from meson_options.txt rename to meson.options From af4f149057f3484ea64ffbfddea0c77bdb3fc9bc Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Wed, 4 Sep 2024 21:46:04 -0700 Subject: [PATCH 2/2] meson: Don't require C++ compiler for build machine on Windows We only build C++ code for the host. Fixes Meson warning: meson.build:486: WARNING: add_languages is missing native:, assuming languages are wanted for both host and build. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 4051a7c11..553314d2b 100644 --- a/meson.build +++ b/meson.build @@ -483,7 +483,7 @@ if host_machine.system() == 'darwin' and not get_option('quartz').disabled() endif if host_machine.system() == 'windows' - add_languages('cpp') + add_languages('cpp', native: false) add_project_arguments('-DWIN32_LEAN_AND_MEAN', '-DNOMINMAX', language: ['c', 'cpp'])