commit 6ea6c581edb3cecf1b4b42854e37b40d6d067cd3
author Cameron Cawley <ccawley2011@gmail.com> Fri Sep 24 22:05:29 2021 +0100
committer Behdad Esfahbod <behdad@behdad.org> Sat Oct 23 13:19:39 2021 -0700
tree 65de0b456439d591efec5efc82f64c2263564ef4
parent ecbe224743c205c99aa459b27e7fb241cc4b1dc5

Remove direct link to dwrite from meson scripts

meson.build

diff --git a/meson.build b/meson.build
index da426ed..4b441a5 100644
--- a/meson.build
+++ b/meson.build
@@ -245,17 +245,12 @@
 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)

src/meson.build

diff --git a/src/meson.build b/src/meson.build
index 7dca59e..db4208f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -363,7 +363,6 @@
 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