Update deps, small changes and cleanup

Signed-off-by: Andrew Opalach <andrew@akon.city>

1 files changed, 6 insertions, 18 deletions

diff --git a/src/fruits/meson.build b/src/fruits/meson.build
index f53a653..b152990 100644
--- a/src/fruits/meson.build
+++ b/src/fruits/meson.build
@@ -1,6 +1,6 @@
-use_tuis = not is_windows
-
-if use_tuis and (get_option('server').enabled() or get_option('client').enabled())
+use_tuis = not is_windows and not is_android
+use_tuis = use_tuis and ('cmsrv' in get_option('fruits') or 'cmc' in get_option('fruits'))
+if use_tuis
   notcurses = dependency('notcurses', required: false, allow_fallback: false)
   notcurses_core = dependency('notcurses-core', required: false, allow_fallback: false)
   if not notcurses.found() or not notcurses_core.found()
@@ -26,18 +26,6 @@ if use_tuis and (get_option('server').enabled() or get_option('client').enabled(
   endif
 endif
 
-if get_option('server').enabled()
-  subdir('cmsrv')
-endif
-
-if get_option('client').enabled()
-  subdir('cmc')
-endif
-
-if get_option('sink').enabled()
-  if is_android
-    subdir('ctv')
-  else
-    subdir('cmv')
-  endif
-endif
+foreach fruit : get_option('fruits')
+  subdir(fruit)
+endforeach