From 0582ab20c0010f7fce4f834cda3c4679dc6fc5d4 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 5 Apr 2025 13:47:05 +0300 Subject: [PATCH 32/32] Meson: Make Windows 10 the minimum requirement by default min-win-ver option can still override this. See RM #1282 Signed-off-by: Marko Lindqvist --- meson.build | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build index eb5c885476..14ea016704 100644 --- a/meson.build +++ b/meson.build @@ -300,6 +300,8 @@ if host_system == 'windows' if min_win_ver != '' add_global_arguments('-D_WIN32_WINNT=' + min_win_ver, language: ['c', 'cpp']) + else + add_global_arguments('-D_WIN32_WINNT=0x0A00', language : ['c', 'cpp']) endif if cxx_build @@ -313,15 +315,6 @@ if host_system == 'windows' add_global_arguments('-Wno-c99-extensions', language : 'cpp') endif endif - if min_win_ver == '' - if qtver == 'qt6' or qtver == 'qt6x' - add_global_arguments('-D_WIN32_WINNT=0x0A00', language : ['c', 'cpp']) - else - add_global_arguments('-D_WIN32_WINNT=0x0603', language : ['c', 'cpp']) - endif - endif - elif min_win_ver == '' - add_global_arguments('-D_WIN32_WINNT=0x0603', language : ['c', 'cpp']) endif net_dep = c_compiler.find_library('ws2_32') -- 2.47.2