From 1a4423cf2045ec4837e85de7cf1f43aeebef695b Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 21 Oct 2022 03:26:08 +0300 Subject: [PATCH 30/30] Meson: Require at least Windows 10 on builds using Qt6 See osdn #45860 Signed-off-by: Marko Lindqvist --- meson.build | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 326ca22746..1955fc2d95 100644 --- a/meson.build +++ b/meson.build @@ -151,7 +151,16 @@ if host_system == 'windows' pub_conf_data.set('FREECIV_HAVE_WINSOCK', 1) pub_conf_data.set('FREECIV_SOCKET_ZERO_NOT_STDIN', 1) priv_conf_data.set('ALWAYS_ROOT', 1) - add_global_arguments('-D_WIN32_WINNT=0x0603', language : ['c', 'cpp']) + + if get_option('qtver') == 'qt6' and \ + ( get_option('ruledit') or \ + get_option('clients').contains('qt') or \ + get_option('fcmp').contains('qt')) + add_global_arguments('-D_WIN32_WINNT=0x0A00', language : ['c', 'cpp']) + else + add_global_arguments('-D_WIN32_WINNT=0x0603', language : ['c', 'cpp']) + endif + net_dep = c_compiler.find_library('ws2_32') else # Assume that vsnprintf() is a working one, if it's found -- 2.35.1