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