From 254868a326c8880137bcd5ca8f478aa5bbbb9ec5 Mon Sep 17 00:00:00 2001 From: Hans-Kristian Arntzen Date: Tue, 8 Sep 2020 08:16:00 +0200 Subject: [PATCH] vkd3d: Enable pthread workaround paths on MinGW as well. winpthread is slow on Wine as it requires OS synchronization objects, which involves wineserver. Signed-off-by: Hans-Kristian Arntzen --- include/private/vkd3d_threads.h | 2 +- meson.build | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/private/vkd3d_threads.h b/include/private/vkd3d_threads.h index 2fb82d27..a482c68d 100644 --- a/include/private/vkd3d_threads.h +++ b/include/private/vkd3d_threads.h @@ -21,7 +21,7 @@ #include "vkd3d_memory.h" -#if defined(_MSC_VER) +#if defined(_WIN32) #define WIN32_LEAN_AND_MEAN #include diff --git a/meson.build b/meson.build index c126945f..0f8ee67f 100644 --- a/meson.build +++ b/meson.build @@ -22,6 +22,10 @@ add_project_arguments('-DHAVE_DXIL_SPV', language : 'c') add_project_arguments('-D_GNU_SOURCE', language : 'c') add_project_arguments('-DPACKAGE_VERSION="' + meson.project_version() + '"', language : 'c') +if vkd3d_platform == 'windows' + add_project_arguments('-D_WIN32_WINNT=0x600', language : 'c') +endif + if enable_standalone_d3d12 add_project_arguments('-DVKD3D_BUILD_STANDALONE_D3D12', language : 'c') endif