6 files changed, 16 insertions, 8 deletions
diff --git a/src/fruits/cmc/meson.build b/src/fruits/cmc/meson.build
index 864af8a..de6d335 100644
--- a/src/fruits/cmc/meson.build
+++ b/src/fruits/cmc/meson.build
@@ -19,7 +19,7 @@ if use_tui
   cmc_deps += [notcurses, notcurses_core, codecs_client]
 endif
 
-if is_windows and meson.is_cross_build()
+if is_windows and not is_msvc
   cmc_args += ['-static', '-static-libgcc', '-static-libstdc++', '-municode', '-mwindows']
 endif
 
diff --git a/src/fruits/cmc/ui/util/waveform.c b/src/fruits/cmc/ui/util/waveform.c
index 535f219..b114a5e 100644
--- a/src/fruits/cmc/ui/util/waveform.c
+++ b/src/fruits/cmc/ui/util/waveform.c
@@ -5,7 +5,7 @@
 #define WITHIN_RMS(low, high, rms) \
     ((low >= 0 && low <= rms) || (high < 0 && high >= -rms) || (low < 0 && high > 0 && rms > 0))
 
-#define OUTPUT_WAVEFORM_PNG
+//#define OUTPUT_WAVEFORM_PNG
 //#define WAVEFORM_REFERENCE_MODE
 #ifdef OUTPUT_WAVEFORM_PNG
 #include <nnwt/file.h>
diff --git a/src/fruits/cmsrv/meson.build b/src/fruits/cmsrv/meson.build
index dce3d94..b12d00d 100644
--- a/src/fruits/cmsrv/meson.build
+++ b/src/fruits/cmsrv/meson.build
@@ -8,7 +8,7 @@ if use_tui
   cmsrv_deps += [notcurses_core]
 endif
 
-if is_windows and meson.is_cross_build()
+if is_windows and not is_msvc
   cmsrv_args += ['-static', '-static-libgcc', '-static-libstdc++', '-municode', '-mwindows']
 endif
 
diff --git a/src/fruits/cmv/cmv.c b/src/fruits/cmv/cmv.c
index 70a0b28..28dcbb5 100644
--- a/src/fruits/cmv/cmv.c
+++ b/src/fruits/cmv/cmv.c
@@ -3,14 +3,16 @@
 #include <nnwt/event_loop.h>
 #include <nnwt/thread.h>
 
-#include "../../util/color_palette.h"
-#include "../../codec/ffmpeg/common.h"
 #include "../../libsink/desktop.h"
 #include "../../server/common.h"
 #ifndef CAMU_SINK_ONLY
 #include "../../server/server.h"
 #endif
 #include "../../server/common.h"
+#include "../../util/color_palette.h"
+#ifdef CAMU_HAVE_FFMPEG
+#include "../../codec/ffmpeg/common.h"
+#endif
 
 #include "../common.h"
 
@@ -95,7 +97,11 @@ static bool parse_exe_name_params(str *exe_name, str *addr, struct lia_prefs *pr
 
     return true;
 def:
+#ifdef CAMU_HAVE_SUBTITLES
     prefs->enabled_mask = CAMU_MASK_AUDIO | CAMU_MASK_VIDEO | CAMU_MASK_SUBTITLE;
+#else
+    prefs->enabled_mask = CAMU_MASK_AUDIO | CAMU_MASK_VIDEO;
+#endif
     prefs->audio_lang = CAMU_LANG_JAPANESE;
     prefs->subtitle_lang = CAMU_LANG_ENGLISH;
 
@@ -175,8 +181,10 @@ s32 window_system_main(u32 argc, str *argv, void *extra)
         c.desktop.exit_callback = exit_callback;
         c.desktop.userdata = &c;
     }
-#endif
     str *name = local ? &al_str_c("local") : &al_str_c("desktop");
+#else
+    str *name = &al_str_c("desktop");
+#endif
     if (!camu_desktop_connect(&c.desktop, name, &c.loop, type, &addr, CAMU_PORT)) {
         return EXIT_FAILURE;
     }
diff --git a/src/fruits/cmv/meson.build b/src/fruits/cmv/meson.build
index 870345e..bfd2182 100644
--- a/src/fruits/cmv/meson.build
+++ b/src/fruits/cmv/meson.build
@@ -14,7 +14,7 @@ if use_tui
 endif
 
 cmv_link_args = []
-if is_windows and meson.is_cross_build()
+if is_windows and not is_msvc
   cmv_link_args += ['-static', '-static-libgcc', '-static-libstdc++', '-municode', '-mwindows']
 endif
 
diff --git a/src/fruits/droid/ctv/gradle/libs.versions.toml b/src/fruits/droid/ctv/gradle/libs.versions.toml
index 4a8d0bc..95dfb43 100644
--- a/src/fruits/droid/ctv/gradle/libs.versions.toml
+++ b/src/fruits/droid/ctv/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.9.1"
+agp = "8.10.0"
 
 [libraries]