From 6ea6c581edb3cecf1b4b42854e37b40d6d067cd3 Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Fri, 24 Sep 2021 22:05:29 +0100 Subject: [PATCH] Remove direct link to dwrite from meson scripts --- meson.build | 7 +------ src/meson.build | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/meson.build b/meson.build index da426edc2..4b441a51e 100644 --- a/meson.build +++ b/meson.build @@ -245,17 +245,12 @@ if host_machine.system() == 'windows' and not get_option('gdi').disabled() endif # DirectWrite (Windows) -directwrite_dep = null_dep if host_machine.system() == 'windows' and not get_option('directwrite').disabled() if get_option('directwrite').enabled() and not cpp.has_header('dwrite_1.h') error('DirectWrite was enabled explicitly, but required header is missing.') endif - directwrite_dep = cpp.find_library('dwrite', required: get_option('directwrite')) - - if directwrite_dep.found() - conf.set('HAVE_DIRECTWRITE', 1) - endif + conf.set('HAVE_DIRECTWRITE', 1) endif # CoreText (macOS) diff --git a/src/meson.build b/src/meson.build index 7dca59ea9..db4208f5c 100644 --- a/src/meson.build +++ b/src/meson.build @@ -363,7 +363,6 @@ endif if conf.get('HAVE_DIRECTWRITE', 0) == 1 hb_sources += hb_directwrite_sources hb_headers += hb_directwrite_headers - harfbuzz_deps += directwrite_dep # hb-directwrite needs a C++ linker libharfbuzz_link_language = 'cpp' endif