ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move some more default settings to config.def.h

This commit is contained in:
twinaphex 2013-10-30 13:58:35 +01:00
parent bb73a82f45
commit 229dbf9cb2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.def.h
View File

@ -282,7 +282,6 @@ static const char *default_overlay_dir = NULL;
#endif
#endif
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL)
#if defined(__QNX__)
static const char *default_shader_dir = "/app/native/shaders_glsl/";
#elif defined(IOS)
@ -292,6 +291,11 @@ static const char *default_shader_dir = "/data/data/com.retroarch/shaders_glsl/"
#else
static const char *default_shader_dir = NULL;
#endif
#if defined(HAVE_RMENU) || defined(HAVE_RGUI) || defined(HAVE_RMENU_XUI)
static bool default_block_config_read = true;
#else
static bool default_block_config_read = false;
#endif
#if defined(ANDROID)

6
settings.c
View File

@ -341,20 +341,16 @@ void config_set_defaults(void)
}
#endif
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL)
if (default_shader_dir)
strlcpy(g_settings.video.shader_dir, default_shader_dir, sizeof(g_settings.video.shader_dir));
#endif
if (default_libretro_info_path)
strlcpy(g_settings.libretro_info_path, default_libretro_info_path, sizeof(g_settings.libretro_info_path));
g_extern.config_save_on_exit = config_save_on_exit;
#if defined(HAVE_RMENU) || defined(HAVE_RGUI) || defined(HAVE_RMENU_XUI)
/* Avoid reloading config on every ROM load */
g_extern.block_config_read = true;
#endif
g_extern.block_config_read = default_block_config_read;
rarch_init_msg_queue();
}