From 7baa8e0dbe816769f1ceeffdc2e72af7797e5df9 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 13 Mar 2020 16:21:25 +0800 Subject: [PATCH] meson: Updates to Uniscribe and DirectWrite build support Update the DirectWrite support to look for dwrite_1.h, and give the green light for both the DirectWrite and Uniscribe build options. --- meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index f85a4a1bb..8e192d7ab 100644 --- a/meson.build +++ b/meson.build @@ -181,7 +181,7 @@ if fontconfig_dep.found() deps += [fontconfig_dep] endif -# uniscribe (windows) - FIXME: untested +# uniscribe (windows) if host_machine.system() == 'windows' and not get_option('uniscribe').disabled() # TODO: make nicer once we have https://github.com/mesonbuild/meson/issues/3940 if cpp.has_header('usp10.h') and cpp.has_header('windows.h') @@ -194,9 +194,9 @@ if host_machine.system() == 'windows' and not get_option('uniscribe').disabled() endif endif -# DirectWrite (windows) - FIXME: untested +# DirectWrite (windows) if host_machine.system() == 'windows' and not get_option('directwrite').disabled() - if cpp.has_header('dwrite.h') + if cpp.has_header('dwrite_1.h') deps += [cpp.find_library('dwrite', required: true)] conf.set('HAVE_DIRECTWRITE', 1) elif get_option('directwrite').enabled()