5 files changed, 28 insertions, 23 deletions
diff --git a/src/fruits/cmsrv/cmsrv.c b/src/fruits/cmsrv/cmsrv.c
index 2f8322c..0149246 100644
--- a/src/fruits/cmsrv/cmsrv.c
+++ b/src/fruits/cmsrv/cmsrv.c
@@ -10,8 +10,10 @@
 
 #include "../../server/server.h"
 #include "../../server/common.h"
-#include "../../cache/handlers/cdio.h"
 #include "../../codec/ffmpeg/common.h"
+#if CACHE_HAVE_CDIO
+#include "../../cache/handlers/cdio.h"
+#endif
 
 #include "../common.h"
 
diff --git a/src/fruits/cmv/cmv.c b/src/fruits/cmv/cmv.c
index 9926f32..ac6f6e8 100644
--- a/src/fruits/cmv/cmv.c
+++ b/src/fruits/cmv/cmv.c
@@ -71,14 +71,16 @@ s32 main(s32 argc, char *argv[])
     camu_ff_set_default_log_callback();
 #endif
 
-    str home;
-    al_str_from(&home, getenv("HOME"));
-
-    str color_palette;
-    al_str_clone(&color_palette, &home);
-    al_str_cat(&color_palette, &al_str_c("/.config/colors.json"));
-    camu_color_palette_init(&color_palette);
-    al_str_free(&color_palette);
+    str home = al_str_null();
+    char *home_env = getenv("HOME");
+    if (home_env) {
+        al_str_from(&home, home_env);
+        str color_palette;
+        al_str_clone(&color_palette, &home);
+        al_str_cat(&color_palette, &al_str_c("/.config/colors.json"));
+        camu_color_palette_init(&color_palette);
+        al_str_free(&color_palette);
+    }
 
     nn_event_loop_init(&c.loop);
 
@@ -105,7 +107,7 @@ s32 main(s32 argc, char *argv[])
         addr = &CAMU_TEST_ADDR;
     }
 #else
-    type = NNWT_SOCKET_TCP; addr = CAMU_TEST_ADDR;
+    type = NNWT_SOCKET_TCP; addr = &CAMU_TEST_ADDR;
 #endif
 
     if (!camu_desktop_init(&c.desktop, "cmv")) failure();
diff --git a/src/fruits/cmv/meson.build b/src/fruits/cmv/meson.build
index 9b83847..870345e 100644
--- a/src/fruits/cmv/meson.build
+++ b/src/fruits/cmv/meson.build
@@ -7,14 +7,10 @@ else
   cmv_deps += [server]
 endif
 
-if get_option('portal').enabled()
-  cmv_deps += [portal]
-endif
-
 use_tui = false
 if use_tui
   cmv_src += []
-  cmv_deps += [dependency('notcurses')]
+  cmv_deps += [notcurses]
 endif
 
 cmv_link_args = []
diff --git a/src/fruits/ctv/meson.build b/src/fruits/ctv/meson.build
index 5a4dca8..1b653e7 100644
--- a/src/fruits/ctv/meson.build
+++ b/src/fruits/ctv/meson.build
@@ -1,6 +1,5 @@
 ctv_src = ['ctv.c', '../../sink/common.c']
 ctv_deps = [common_deps, libsink]
 ctv_args = ['-DCAMU_MIXER_THREADED', '-DCAMU_SCREEN_THREADED']
-
 # https://github.com/google/ExoPlayer/issues/9933#issuecomment-1029775358
 shared_library('ctv', ctv_src, dependencies: ctv_deps, c_args: ctv_args, link_args: ['-Wl,-Bsymbolic', '-static-libstdc++'])
diff --git a/src/fruits/meson.build b/src/fruits/meson.build
index 2ceeaa0..37edd0b 100644
--- a/src/fruits/meson.build
+++ b/src/fruits/meson.build
@@ -1,28 +1,34 @@
-if get_option('server').enabled() or get_option('client').enabled()
+if (get_option('server').enabled() or get_option('client').enabled()) and not is_windows
   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' })
     notcurses_opts.add_cmake_defines({ 'USE_CXX': false })
+    notcurses_opts.add_cmake_defines({ 'USE_DEFLATE': 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': 'ffmpeg' })
+    notcurses_opts.add_cmake_defines({ 'USE_STATIC': true })
+    notcurses_opts.add_cmake_defines({ 'USE_MULTIMEDIA': is_windows ? 'none' : 'ffmpeg' })
     notcurses_proj = cmake.subproject('notcurses', options: notcurses_opts)
-    notcurses = notcurses_proj.dependency('notcurses')
-    notcurses_core = notcurses_proj.dependency('notcurses-core')
+    if is_windows
+      notcurses = notcurses_proj.dependency('notcurses-static')
+      notcurses_core = notcurses_proj.dependency('notcurses-core-static')
+    else
+      notcurses = notcurses_proj.dependency('notcurses')
+      notcurses_core = notcurses_proj.dependency('notcurses-core')
+    endif
   endif
 endif
 
-if get_option('server').enabled()
+if get_option('server').enabled() and not is_windows
   subdir('cmsrv')
 endif
 
-if get_option('client').enabled()
+if get_option('client').enabled() and not is_windows
   subdir('cmc')
 endif