Improve flake and build

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

1 files changed, 15 insertions, 11 deletions

diff --git a/taro/meson.build b/taro/meson.build
index a5be1e0..a7fa3a1 100644
--- a/taro/meson.build
+++ b/taro/meson.build
@@ -1,29 +1,33 @@
+taro_src = ['ui.c', 'db.c', 'file_ext.c']
+taro_deps = [naunet]
+
 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()
   notcurses_opts = cmake.subproject_options()
   notcurses_opts.add_cmake_defines({ 'CMAKE_BUILD_TYPE': is_debug ? 'Debug' : 'Release' })
-  use_oiio = false
-  notcurses_opts.add_cmake_defines({ 'USE_CXX': use_oiio })
+  notcurses_opts.add_cmake_defines({ 'USE_CXX': false })
   notcurses_opts.add_cmake_defines({ 'USE_DOCTEST': false })
   notcurses_opts.add_cmake_defines({ 'USE_PANDOC': false })
   notcurses_opts.add_cmake_defines({ 'BUILD_EXECUTABLES': false })
   notcurses_opts.add_cmake_defines({ 'BUILD_FFI_LIBRARY': false })
   notcurses_opts.add_cmake_defines({ 'USE_POC': false })
-  notcurses_opts.add_cmake_defines({ 'USE_STATIC': false })
-  notcurses_opts.add_cmake_defines({ 'USE_MULTIMEDIA': use_oiio ? 'oiio' : 'ffmpeg' })
+  notcurses_opts.add_cmake_defines({ 'USE_STATIC': true })
+  notcurses_opts.add_cmake_defines({ 'USE_MULTIMEDIA': 'ffmpeg' })
   notcurses_proj = cmake.subproject('notcurses', options: notcurses_opts)
-  notcurses = notcurses_proj.dependency('notcurses')
-  notcurses_core = notcurses_proj.dependency('notcurses-core')
+  notcurses = notcurses_proj.dependency('notcurses-static')
+  notcurses_core = notcurses_proj.dependency('notcurses-core-static')
+  libdeflate = dependency('libdeflate', static: true)
+  taro_deps += [libdeflate]
 endif
+taro_deps += [notcurses, notcurses_core]
 
-taro_deps = [naunet, notcurses, notcurses_core]
-taro_src = ['ui.c', 'db.c', 'file_ext.c']
-
-tarod_deps = [naunet, stela]
 tarod_src = ['daemon.c', 'file_ext.c']
+tarod_deps = [naunet, stela]
 
 executable('taro', taro_src, dependencies: taro_deps, install: true)
 executable('tarod', tarod_src, dependencies: tarod_deps, install: true)
 
-subdir('tests')
+if get_option('tests').enabled()
+  subdir('tests')
+endif