From 2daa31c0629f2eb4af84d6f4fed8ac89813de056 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Wed, 22 Jan 2025 20:56:04 -0500 Subject: Big build update Signed-off-by: Andrew Opalach --- src/fruits/cmv/cmv.c | 20 +++++++++++--------- src/fruits/cmv/meson.build | 6 +----- 2 files changed, 12 insertions(+), 14 deletions(-) (limited to 'src/fruits/cmv') 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 = [] -- cgit v1.2.3-101-g0448