From 90a5c5e0753775f1d5d06aeddb30aba877fbc47e Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 30 Jan 2023 02:25:24 +0200 Subject: [PATCH 45/45] Meson: Disable shadow warnings on Windows C++ compilations See osdn #46658 Signed-off-by: Marko Lindqvist --- meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index ab72526b58..85457b2d9d 100644 --- a/meson.build +++ b/meson.build @@ -82,11 +82,13 @@ if get_option('debug') pub_conf_data.set('FREECIV_DEBUG', 1) add_global_arguments( '-Werror', - '-Wshadow', language: ['c', 'cpp']) + add_global_arguments('-Wshadow', language: ['c']) if host_system == 'windows' # Qt headers have problems with dllimport attributes add_global_arguments('-Wno-error=attributes', language : 'cpp') + else + add_global_arguments('-Wshadow', language: ['cpp']) endif else add_global_arguments('-DQT_NO_DEBUG', language : 'cpp') -- 2.39.0