summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2020-11-11 03:50:46 +0000
committerMatthias Clasen <mclasen@redhat.com>2020-11-11 03:50:46 +0000
commita047b7d6d1f2749e257e582f166a8e86b769503a (patch)
tree93f21414b9856339d714155f5b1fe7f8400bd4f0
parent0ececc7109577ce8d054821556416709679b401c (diff)
parenta76f37a501e18ee66205f56bc6731c1a9515e1e2 (diff)
downloadgtk+-a047b7d6d1f2749e257e582f166a8e86b769503a.tar.gz
Merge branch 'fix-demos-wo-pangoft2' into 'master'
gtk-demo: Fix building scrolling demo without PangoFT2 See merge request GNOME/gtk!2807
-rw-r--r--demos/gtk-demo/meson.build9
1 files changed, 6 insertions, 3 deletions
diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
index 49f37c7130..b14f1e04f2 100644
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -55,6 +55,7 @@ demos = files([
'listview_filebrowser.c',
'listview_minesweeper.c',
'listview_settings.c',
+ 'listview_ucd.c',
'listview_weather.c',
'listview_words.c',
'markup.c',
@@ -120,11 +121,13 @@ extra_demo_sources = files(['main.c',
'four_point_transform.c',
'demo2widget.c',
'demo3widget.c',
- 'pixbufpaintable.c'])
+ 'pixbufpaintable.c',
+ 'script-names.c',
+ 'unicode-names.c'])
if harfbuzz_dep.found() and pangoft_dep.found()
- demos += files(['font_features.c', 'listview_ucd.c'])
- extra_demo_sources += files(['script-names.c', 'language-names.c', 'unicode-names.c'])
+ demos += files(['font_features.c'])
+ extra_demo_sources += files(['language-names.c'])
gtkdemo_deps += [ harfbuzz_dep, epoxy_dep ]
endif