From 3aaab43736f4e42026e5fa20cffc2907156e2370 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 4 Feb 2018 19:57:31 +0100 Subject: [PATCH] Should fix Emscripten build --- menu/cbs/menu_cbs_get_value.c | 20 ++++++++++++-------- menu/drivers/zarch.c | 2 ++ menu/menu_setting.c | 2 ++ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index cbf73cca84..1741871418 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -309,6 +309,7 @@ static void menu_action_setting_disp_set_label_pipeline( } +#ifdef HAVE_NETWORKING static void menu_action_setting_disp_set_label_netplay_mitm_server( file_list_t* list, unsigned *w, unsigned type, unsigned i, @@ -318,6 +319,7 @@ static void menu_action_setting_disp_set_label_netplay_mitm_server( const char *path, char *s2, size_t len2) { + unsigned i; settings_t *settings = config_get_ptr(); *s = '\0'; @@ -327,17 +329,17 @@ static void menu_action_setting_disp_set_label_netplay_mitm_server( if (!settings) return; - if (!string_is_empty(settings->arrays.netplay_mitm_server)) - { - unsigned i; + if (string_is_empty(settings->arrays.netplay_mitm_server)) + return; - for (i = 0; i < ARRAY_SIZE(netplay_mitm_server_list); i++) - { - if (string_is_equal(settings->arrays.netplay_mitm_server, netplay_mitm_server_list[i].name)) - strlcpy(s, netplay_mitm_server_list[i].description, len); - } + for (i = 0; i < ARRAY_SIZE(netplay_mitm_server_list); i++) + { + if (string_is_equal(settings->arrays.netplay_mitm_server, + netplay_mitm_server_list[i].name)) + strlcpy(s, netplay_mitm_server_list[i].description, len); } } +#endif static void menu_action_setting_disp_set_label_shader_watch_for_changes( file_list_t* list, @@ -2230,8 +2232,10 @@ int menu_cbs_init_bind_get_string_representation(menu_file_list_cbs_t *cbs, menu_action_setting_disp_set_label_achievement_information); return 0; case MENU_ENUM_LABEL_NETPLAY_MITM_SERVER: +#ifdef HAVE_NETWORKING BIND_ACTION_GET_VALUE(cbs, menu_action_setting_disp_set_label_netplay_mitm_server); +#endif return 0; default: break; diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c index fd06e5600c..654490c301 100644 --- a/menu/drivers/zarch.c +++ b/menu/drivers/zarch.c @@ -729,7 +729,9 @@ static int zarch_zui_render_lay_root_downloads( static int zarch_zui_render_lay_root(video_frame_info_t *video_info, zui_t *zui) { +#ifdef ZARCH_DEBUG char item[PATH_MAX_LENGTH]; +#endif static struct zui_tabbed tabbed = {~0U}; zarch_zui_tabbed_begin(zui, &tabbed, 0, 0); diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 356ac85fe8..e323ff140e 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -575,11 +575,13 @@ static void setting_get_string_representation_uint_autosave_interval(void *data, } #endif +#if defined(HAVE_NETWORKING) static void setting_get_string_representation_netplay_mitm_server(void *data, char *s, size_t len) { } +#endif #ifdef HAVE_LANGEXTRA static void setting_get_string_representation_uint_user_language(void *data,