diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2018-03-28 12:57:28 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2018-04-02 19:15:18 +0800 |
| commit | 464943e5a69ad0c94d06170ffac91b6ba3aba703 (patch) | |
| tree | 1f17ade3fe775da95d28288d081371d4d1d8399a /demos | |
| parent | bca4a78f077626f81f072bca9da80405d03e626e (diff) | |
| download | gtk+-464943e5a69ad0c94d06170ffac91b6ba3aba703.tar.gz | |
gtk, demos: Fix builds without HarfBuzz and PangoFT
Really exclude the portions in the gtkfontchooserwidget.c that are built
when HarfBuzz and PangoFT2 are built, and update the Meson files to
exclude such sources as well from the main GTK SO/DLL and from the
gtk4-demo program.
https://bugzilla.gnome.org/show_bug.cgi?id=773299
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/gtk-demo/meson.build | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build index 432aecb51b..b6492c7b5b 100644 --- a/demos/gtk-demo/meson.build +++ b/demos/gtk-demo/meson.build @@ -76,8 +76,11 @@ demos = files([ gtkdemo_deps = [ libgtk_dep, ] +extra_demo_sources = files(['main.c', 'gtkfishbowl.c', 'fontplane.c', 'gtkgears.c']) + if harfbuzz_dep.found() and pangoft_dep.found() demos += files('font_features.c') + extra_demo_sources += files(['script-names.c', 'language-names.c']) gtkdemo_deps += [ harfbuzz_dep, ] endif @@ -97,9 +100,7 @@ gtkdemo_resources = gnome.compile_resources('gtkdemo_resources', source_dir: '.') executable('gtk4-demo', - 'main.c', 'gtkfishbowl.c', 'fontplane.c', 'script-names.c', 'language-names.c', - 'gtkgears.c', - demos, demos_h, gtkdemo_resources, + demos, demos_h, extra_demo_sources, gtkdemo_resources, c_args: gtkdemo_args, dependencies: gtkdemo_deps, include_directories: confinc, @@ -135,4 +136,4 @@ install_data('org.gtk.Demo.gschema.xml', install_dir: gtk_schemasdir) gnome.compile_schemas() # appdata -install_data('org.gtk.Demo.appdata.xml', install_dir: gtk_appdatadir)
\ No newline at end of file +install_data('org.gtk.Demo.appdata.xml', install_dir: gtk_appdatadir) |