mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Take out HAVE_DYNAMIC ifdef for menu_config_directory

Browse Source
This commit is contained in:
twinaphex 2014-07-27 03:05:11 +02:00
parent f764d9319b
commit 43929afc21
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/menu/backend/menu_common_backend.c
View File

@ -401,9 +401,7 @@ static void menu_common_entries_init(void *data, unsigned menu_type)
file_list_push(menu->selection_buf, current_setting->short_description, MENU_CONTENT_DIR_PATH, 0);
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "assets_directory")))
file_list_push(menu->selection_buf, current_setting->short_description, MENU_ASSETS_DIR_PATH, 0);
#ifdef HAVE_DYNAMIC
file_list_push(menu->selection_buf, "Config Directory", MENU_CONFIG_DIR_PATH, 0);
#endif
file_list_push(menu->selection_buf, "Core Directory", MENU_LIBRETRO_DIR_PATH, 0);
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "libretro_info_path")))
file_list_push(menu->selection_buf, current_setting->short_description, MENU_LIBRETRO_INFO_DIR_PATH, 0);
@ -2753,13 +2751,11 @@ static int menu_common_iterate(unsigned action)
driver.menu_ctx->init_core_info(driver.menu);
menu_flush_stack_type(MENU_SETTINGS_PATH_OPTIONS);
}
#ifdef HAVE_DYNAMIC
else if (menu_type == MENU_CONFIG_DIR_PATH)
{
strlcpy(g_settings.menu_config_directory, dir, sizeof(g_settings.menu_config_directory));
menu_flush_stack_type(MENU_SETTINGS_PATH_OPTIONS);
}
#endif
else if (menu_type == MENU_LIBRETRO_INFO_DIR_PATH)
{
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "libretro_info_path")))

12
frontend/menu/menu_common.c
View File

@ -115,14 +115,10 @@ void load_menu_game_prepare(void)
msg_queue_push(g_extern.msg_queue, str, 1, 1);
}
#ifdef RARCH_CONSOLE
if (g_extern.system.no_game || *g_extern.fullpath)
#endif
if (g_extern.history)
content_history_push(g_extern.history,
*g_extern.fullpath ? g_extern.fullpath : NULL,
g_settings.libretro,
driver.menu->info.library_name ? driver.menu->info.library_name : "");
content_history_push(g_extern.history,
*g_extern.fullpath ? g_extern.fullpath : NULL,
g_settings.libretro,
driver.menu->info.library_name ? driver.menu->info.library_name : "");
}
// redraw menu frame