Revert "Remove direct link to dwrite from meson scripts"
This reverts commit 6ea6c581ed
.
This commit is contained in:
parent
071aea42c2
commit
549e2b7038
|
@ -239,12 +239,17 @@ 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
|
||||
|
||||
conf.set('HAVE_DIRECTWRITE', 1)
|
||||
directwrite_dep = cpp.find_library('dwrite', required: get_option('directwrite'))
|
||||
|
||||
if directwrite_dep.found()
|
||||
conf.set('HAVE_DIRECTWRITE', 1)
|
||||
endif
|
||||
endif
|
||||
|
||||
# CoreText (macOS)
|
||||
|
|
|
@ -363,6 +363,7 @@ 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
|
||||
|
|
Loading…
Reference in New Issue