From 0dad59e82d77186d81063b409a7ea2cef15b0f40 Mon Sep 17 00:00:00 2001
From: Phil Jones <philj56@gmail.com>
Date: Thu, 23 Jun 2022 15:16:36 +0100
Subject: Combine Harfbuzz & Pango backends.

Tofi now uses Harfbuzz if a file is passed to --font-name, and Pango
otherwise.
---
 meson.build | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'meson.build')

diff --git a/meson.build b/meson.build
index eb5c44d..810780b 100644
--- a/meson.build
+++ b/meson.build
@@ -55,12 +55,14 @@ add_project_arguments(
   language: 'c'
 )
 
-common_sources = files(
+tofi_sources = files(
   'src/main.c',
   'src/color.c',
   'src/compgen.c',
   'src/config.c',
   'src/entry.c',
+  'src/entry_backend/pango.c',
+  'src/entry_backend/harfbuzz.c',
   'src/history.c',
   'src/log.c',
   'src/mkdirp.c',
@@ -71,8 +73,6 @@ common_sources = files(
   'src/xmalloc.c',
 )
 
-pango_sources = files('src/entry_backend/pango.c')
-harfbuzz_sources = files('src/entry_backend/harfbuzz.c')
 compgen_sources = files(
   'src/main_compgen.c',
   'src/compgen.c',
@@ -124,16 +124,8 @@ endforeach
 
 executable(
   'tofi',
-  common_sources, harfbuzz_sources, wl_proto_src, wl_proto_headers,
-  dependencies: [libm, freetype, harfbuzz, cairo, wayland_client, xkbcommon],
-  install: true
-)
-
-executable(
-  'tofi-pango',
-  common_sources, pango_sources, wl_proto_src, wl_proto_headers,
-  dependencies: [pangocairo, wayland_client, xkbcommon],
-  c_args: '-DUSE_PANGO',
+  tofi_sources, wl_proto_src, wl_proto_headers,
+  dependencies: [libm, freetype, harfbuzz, cairo, pangocairo, wayland_client, xkbcommon],
   install: true
 )
 
-- 
cgit v1.2.3