aboutsummaryrefslogtreecommitdiff
path: root/meson.build
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-12-01 12:52:30 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-12-01 12:52:30 +0000
commit526f65a39284e89481bb21cf4c07a4ef59eddcd8 (patch)
treed692fa02983cdb9aa9af7e25d60ecf91fc76c4a6 /meson.build
parentfont: log fontconfig/freetype version when debug logging has been enabled (diff)
parentPKGBUILD: don't error out on missing profile data count files (diff)
Merge branch 'use-fcft'
Diffstat (limited to 'meson.build')
-rw-r--r--meson.build17
1 files changed, 14 insertions, 3 deletions
diff --git a/meson.build b/meson.build
index 26c5622d..fe33d497 100644
--- a/meson.build
+++ b/meson.build
@@ -62,7 +62,19 @@ version = custom_target(
output: 'version.h',
command: [generate_version_sh, meson.project_version(), '@SOURCE_DIR@', '@OUTPUT@'])
-tllist = subproject('tllist').get_variable('tllist')
+tllist_proj = subproject('tllist')
+if tllist_proj.found()
+ tllist = tllist_proj.get_variable('tllist')
+else
+ tllist = dependency('tllist')
+endif
+
+fcft_proj = subproject('fcft')
+if fcft_proj.found()
+ fcft = fcft_proj.get_variable('fcft')
+else
+ fcft = dependency('fcft')
+endif
executable(
'foot',
@@ -72,7 +84,6 @@ executable(
'commands.c', 'commands.h',
'csi.c', 'csi.h',
'fdm.c', 'fdm.h',
- 'font.c', 'font.h',
'grid.c', 'grid.h',
'input.c', 'input.h',
'log.c', 'log.h',
@@ -90,7 +101,7 @@ executable(
'wayland.c', 'wayland.h',
wl_proto_src + wl_proto_headers, version,
dependencies: [threads, math, freetype, fontconfig, pixman, wayland_client, wayland_cursor, xkb,
- tllist],
+ tllist, fcft],
install: true)
executable(