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

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.
This commit is contained in:
Chun-wei Fan 2020-03-13 16:21:25 +08:00 committed by Ebrahim Byagowi
parent 733414b286
commit 7baa8e0dbe
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meson.build
View File

@ -181,7 +181,7 @@ if fontconfig_dep.found()
deps += [fontconfig_dep] deps += [fontconfig_dep]
endif endif
# uniscribe (windows) - FIXME: untested # uniscribe (windows)
if host_machine.system() == 'windows' and not get_option('uniscribe').disabled() if host_machine.system() == 'windows' and not get_option('uniscribe').disabled()
# TODO: make nicer once we have https://github.com/mesonbuild/meson/issues/3940 # 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') 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
endif endif
# DirectWrite (windows) - FIXME: untested # DirectWrite (windows)
if host_machine.system() == 'windows' and not get_option('directwrite').disabled() 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)] deps += [cpp.find_library('dwrite', required: true)]
conf.set('HAVE_DIRECTWRITE', 1) conf.set('HAVE_DIRECTWRITE', 1)
elif get_option('directwrite').enabled() elif get_option('directwrite').enabled()