From bd930bc98de7e5915275b2b8f3782ea349a9d60b Mon Sep 17 00:00:00 2001 From: Luca Bacci Date: Mon, 16 Jun 2025 11:30:12 +0200 Subject: [PATCH] Meson: Do not check for d2d1.h, dwrite.h, wincodec.h If the import libraries are found, we can assume that headers are present as well. All three headers were introduced many years ago in the Windows SDK and mingw-w64 headers. --- meson.build | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meson.build b/meson.build index ee2a4e70b..baf59ec45 100644 --- a/meson.build +++ b/meson.build @@ -518,13 +518,10 @@ if host_machine.system() == 'windows' cpp_compiler = meson.get_compiler('cpp') d2d_dep = cpp_compiler.find_library('d2d1', required: get_option('dwrite')) dwrite_dep = cpp_compiler.find_library('dwrite', required: get_option('dwrite')) - d2d_header = cpp_compiler.has_header('d2d1.h') d2d_3_header = cpp_compiler.has_header('d2d1_3.h') - dwrite_header = cpp_compiler.has_header('dwrite.h') wincodec_dep = cpp_compiler.find_library('windowscodecs', required: get_option('dwrite')) - wincodec_header = cpp_compiler.has_header('wincodec.h') - if d2d_dep.found() and dwrite_dep.found() and d2d_header and dwrite_header and wincodec_dep.found() and wincodec_header + if d2d_dep.found() and dwrite_dep.found() feature_conf.set('CAIRO_HAS_DWRITE_FONT', 1) built_features += [{ 'name': 'cairo-dwrite-font',