Move some more default settings to config.def.h

This commit is contained in:
twinaphex 2013-10-31 02:34:49 +01:00
parent 32acec4ab9
commit 1bdaf62be1
3 changed files with 9 additions and 3 deletions

View File

@ -292,6 +292,12 @@ static const char *default_shader_dir = "/data/data/com.retroarch/shaders_glsl/"
static const char *default_shader_dir = NULL;
#endif
#if defined(__QNX__)
static const char *default_config_path = "app/native/retroarch.cfg";
#else
static const char *default_config_path = NULL;
#endif
#if defined(HAVE_RMENU) || defined(HAVE_RGUI) || defined(HAVE_RMENU_XUI)
static bool default_block_config_read = true;
#else

View File

@ -31,9 +31,6 @@ static void get_environment_settings(int argc, char *argv[], void *args)
/* FIXME - should this apply for both BB10 and PB? */
#if defined(__QNX__) && !defined(HAVE_BB10)
rarch_environment_cb(RETRO_ENVIRONMENT_SET_LIBRETRO_PATH, (void*)"app/native/lib");
strlcpy(g_extern.config_path, "app/native/retroarch.cfg", sizeof(g_extern.config_path));
strlcpy(g_settings.video.shader_dir, "app/native/shaders_glsl", sizeof(g_settings.video.shader_dir));
#endif
config_load();

View File

@ -350,6 +350,9 @@ void config_set_defaults(void)
if (default_libretro_info_path)
strlcpy(g_settings.libretro_info_path, default_libretro_info_path, sizeof(g_settings.libretro_info_path));
if (default_config_path)
strlcpy(g_extern.config_path, default_config_path, sizeof(g_extern.config_path));
g_extern.config_save_on_exit = config_save_on_exit;
/* Avoid reloading config on every ROM load */