walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Remove direct link to dwrite from meson scripts" 

This reverts commit 6ea6c581ed.
This commit is contained in:
Khaled Hosny 2021-12-01 03:16:26 +02:00
parent 071aea42c2
commit 549e2b7038
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meson.build
View File

@ -239,12 +239,17 @@ if host_machine.system() == 'windows' and not get_option('gdi').disabled()
endif endif
# DirectWrite (Windows) # DirectWrite (Windows)
directwrite_dep = null_dep
if host_machine.system() == 'windows' and not get_option('directwrite').disabled() if host_machine.system() == 'windows' and not get_option('directwrite').disabled()
if get_option('directwrite').enabled() and not cpp.has_header('dwrite_1.h') if get_option('directwrite').enabled() and not cpp.has_header('dwrite_1.h')
error('DirectWrite was enabled explicitly, but required header is missing.') error('DirectWrite was enabled explicitly, but required header is missing.')
endif 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 endif
# CoreText (macOS) # CoreText (macOS)

1
src/meson.build
View File

@ -363,6 +363,7 @@ endif
if conf.get('HAVE_DIRECTWRITE', 0) == 1 if conf.get('HAVE_DIRECTWRITE', 0) == 1
hb_sources += hb_directwrite_sources hb_sources += hb_directwrite_sources
hb_headers += hb_directwrite_headers hb_headers += hb_directwrite_headers
harfbuzz_deps += directwrite_dep
# hb-directwrite needs a C++ linker # hb-directwrite needs a C++ linker
libharfbuzz_link_language = 'cpp' libharfbuzz_link_language = 'cpp'
endif endif