From 229dbf9cb2fc42771bb979af046e42698dfa9b22 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 30 Oct 2013 13:58:35 +0100
Subject: [PATCH] Move some more default settings to config.def.h

---
 config.def.h | 6 +++++-
 settings.c   | 6 +-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config.def.h b/config.def.h
index 0fb91c78db..228a2a228a 100644
--- a/config.def.h
+++ b/config.def.h
@@ -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)
diff --git a/settings.c b/settings.c
index 22af8d6d41..2d32b5a3d7 100644
--- a/settings.c
+++ b/settings.c
@@ -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();
 }