Take out remaining hardcoded path settings in config.def.h

This commit is contained in:
twinaphex 2014-07-23 16:38:43 +02:00
parent fd83a6b445
commit d007a7d2e3
3 changed files with 2 additions and 24 deletions

View File

@ -356,22 +356,6 @@ static bool default_core_specific_config = true;
static bool default_core_specific_config = false;
#endif
#if defined(_XBOX1)
static const char *default_libretro_info_path = "D:";
#elif defined(_XBOX360)
static const char *default_libretro_info_path = "game:";
#else
static const char *default_libretro_info_path = NULL;
#endif
#if defined(_XBOX1)
static const char *default_libretro_path = "D:";
#elif defined(_XBOX360)
static const char *default_libretro_path = "game:";
#else
static const char *default_libretro_path = NULL;
#endif
// Crop overscanned frames.
static const bool crop_overscan = true;

View File

@ -481,12 +481,6 @@ void config_set_defaults(void)
if (default_dsp_filter_dir)
fill_pathname_expand_special(g_settings.audio.filter_dir, default_dsp_filter_dir, sizeof(g_settings.audio.filter_dir));
if (default_libretro_path && !g_extern.has_set_libretro_directory)
fill_pathname_expand_special(g_settings.libretro_directory, default_libretro_path, sizeof(g_settings.libretro_directory));
if (default_libretro_info_path)
fill_pathname_expand_special(g_settings.libretro_info_path, default_libretro_info_path, sizeof(g_settings.libretro_info_path));
if (*g_defaults.audio_filter_dir)
strlcpy(g_settings.audio.filter_dir, g_defaults.audio_filter_dir, sizeof(g_settings.audio.filter_dir));
if (*g_defaults.assets_dir)
@ -496,7 +490,7 @@ void config_set_defaults(void)
if (*g_defaults.core_path)
strlcpy(g_settings.libretro, g_defaults.core_path, sizeof(g_settings.libretro));
if (*g_defaults.core_info_dir)
strlcpy(g_settings.libretro_info_path, g_defaults.core_info_dir, sizeof(g_settings.libretro_info_path));
fill_pathname_expand_special(g_settings.libretro_info_path, g_defaults.core_info_dir, sizeof(g_settings.libretro_info_path));
#ifdef HAVE_OVERLAY
if (*g_defaults.overlay_dir)
{

View File

@ -1099,7 +1099,7 @@ rarch_setting_t* setting_data_get_list(void)
#endif
CONFIG_PATH(g_settings.libretro, "libretro_path", "Libretro Path", "", GROUP_NAME, SUBGROUP_NAME, general_change_handler) WITH_FLAGS(SD_FLAG_ALLOW_EMPTY)
CONFIG_PATH(g_settings.libretro_info_path, "libretro_info_path", "Core Info Directory", default_libretro_info_path, GROUP_NAME, SUBGROUP_NAME, general_change_handler) WITH_FLAGS(SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR)
CONFIG_PATH(g_settings.libretro_info_path, "libretro_info_path", "Core Info Directory", g_defaults.core_info_dir ? g_defaults.core_info_dir : "", GROUP_NAME, SUBGROUP_NAME, general_change_handler) WITH_FLAGS(SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR)
CONFIG_PATH(g_settings.core_options_path, "core_options_path", "Core Options Path", "", "Paths", SUBGROUP_NAME, general_change_handler) WITH_FLAGS(SD_FLAG_ALLOW_EMPTY)
CONFIG_PATH(g_settings.cheat_database, "cheat_database_path", "Cheat Database", "", "Paths", SUBGROUP_NAME, general_change_handler) WITH_FLAGS(SD_FLAG_ALLOW_EMPTY)
CONFIG_PATH(g_settings.cheat_settings_path, "cheat_settings_path", "Cheat Settings", "", GROUP_NAME, SUBGROUP_NAME, general_change_handler) WITH_FLAGS(SD_FLAG_ALLOW_EMPTY)