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

meson: more windows fixes

This commit is contained in:
Mathieu Duponchelle 2018-05-17 14:53:20 -07:00 committed by Ebrahim Byagowi
parent 7ee650b173
commit 99b26789d2
2 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/meson.build
View File

@ -184,12 +184,17 @@ libharfbuzz = library('harfbuzz', hb_sources,
include_directories: [incbase, incucdn], include_directories: [incbase, incucdn],
dependencies: deps, dependencies: deps,
cpp_args: cpp_args, cpp_args: cpp_args,
) vs_module_defs: 'harfbuzz.def',
soversion: '0',
name_prefix: 'lib')
libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources, libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources,
include_directories: incbase, include_directories: incbase,
link_with: [libharfbuzz], link_with: [libharfbuzz],
cpp_args: cpp_args) cpp_args: cpp_args,
vs_module_defs: 'harfbuzz-subset.def',
soversion: '0',
name_prefix: 'lib')
if conf.get('HAVE_GOBJECT', 0) == 1 if conf.get('HAVE_GOBJECT', 0) == 1
gnome = import('gnome') gnome = import('gnome')
@ -233,5 +238,8 @@ if conf.get('HAVE_GOBJECT', 0) == 1
include_directories: incbase, include_directories: incbase,
dependencies: deps, dependencies: deps,
link_with: [libharfbuzz], link_with: [libharfbuzz],
cpp_args: cpp_args) cpp_args: cpp_args,
vs_module_defs: 'harfbuzz-gobject.def',
soversion: '0',
name_prefix: 'lib')
endif endif

21
util/meson.build
View File

@ -22,30 +22,35 @@ hb_subset_cli_sources = [
'options.cc', 'options.cc',
] ]
hb_view = executable('hb-view', hb_view_sources, if conf.get('HAVE_GLIB', 0) == 1
if conf.get('HAVE_FREETYPE', 0) == 1 and conf.get('HAVE_CAIRO_FT', 0) == 1
hb_view = executable('hb-view', hb_view_sources,
cpp_args: cpp_args, cpp_args: cpp_args,
include_directories: [incbase, incsrc], include_directories: [incbase, incsrc],
dependencies: deps, dependencies: deps,
link_with: [libharfbuzz] link_with: [libharfbuzz]
) )
endif
hb_shape = executable('hb-shape', hb_shape_sources, hb_shape = executable('hb-shape', hb_shape_sources,
cpp_args: cpp_args, cpp_args: cpp_args,
include_directories: [incbase, incsrc], include_directories: [incbase, incsrc],
dependencies: deps, dependencies: deps,
link_with: [libharfbuzz] link_with: [libharfbuzz]
) )
hb_subset = executable('hb-subset', hb_subset_cli_sources, hb_subset = executable('hb-subset', hb_subset_cli_sources,
cpp_args: cpp_args, cpp_args: cpp_args,
include_directories: [incbase, incsrc], include_directories: [incbase, incsrc],
dependencies: deps, dependencies: deps,
link_with: [libharfbuzz, libharfbuzz_subset] link_with: [libharfbuzz, libharfbuzz_subset]
) )
hb_ot_shape_closure = executable('hb-ot-shape-closure', hb_ot_shape_closure_sources, hb_ot_shape_closure = executable('hb-ot-shape-closure', hb_ot_shape_closure_sources,
cpp_args: cpp_args, cpp_args: cpp_args,
include_directories: [incbase, incsrc], include_directories: [incbase, incsrc],
dependencies: deps, dependencies: deps,
link_with: [libharfbuzz] link_with: [libharfbuzz]
) )
endif