CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-16 07:16:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Android) Take out some hardcoded default dirs in config.def.h

Browse Source
This commit is contained in:
twinaphex 2014-07-23 16:08:25 +02:00
parent c451b22019
commit 719b3d4cc5
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config.def.h
View File

@ -343,8 +343,6 @@ static bool config_save_on_exit = true;
// Default overlay directory
#if defined(__QNX__)
static const char *default_overlay_dir = "app/native/overlays/";
#elif defined(ANDROID)
static const char *default_overlay_dir = "/data/data/com.retroarch/overlays/";
#else
static const char *default_overlay_dir = NULL;
#endif
@ -354,8 +352,6 @@ static const bool default_overlay_enable = false;
#if defined(__QNX__)
static const char *default_shader_dir = "/app/native/shaders_glsl/";
#elif defined(ANDROID)
static const char *default_shader_dir = "/data/data/com.retroarch/shaders_glsl/";
#else
static const char *default_shader_dir = NULL;
#endif
@ -381,9 +377,7 @@ static bool default_core_specific_config = true;
static bool default_core_specific_config = false;
#endif
#if defined(ANDROID)
static const char *default_libretro_info_path = "/data/data/com.retroarch/info/";
#elif defined(__QNX__)
#if defined(__QNX__)
static const char *default_libretro_info_path = "/app/native/info/";
#elif defined(_XBOX1)
static const char *default_libretro_info_path = "D:";
@ -393,9 +387,7 @@ static const char *default_libretro_info_path = "game:";
static const char *default_libretro_info_path = NULL;
#endif
#if defined(ANDROID)
static const char *default_libretro_path = "/data/data/com.retroarch/cores/";
#elif defined(__QNX__)
#if defined(__QNX__)
static const char *default_libretro_path = "/app/native/lib/";
#elif defined(_XBOX1)
static const char *default_libretro_path = "D:";

4
frontend/platform/platform_android.c
View File

@ -575,6 +575,10 @@ static void frontend_android_get_environment_settings(int *argc, char *argv[],
fill_pathname_join(g_defaults.savestate_dir, path, "savestates", sizeof(g_defaults.savestate_dir));
fill_pathname_join(g_defaults.sram_dir, path, "savefiles", sizeof(g_defaults.sram_dir));
fill_pathname_join(g_defaults.system_dir, path, "system", sizeof(g_defaults.system_dir));
fill_pathname_join(g_defaults.shader_dir, path, "shaders_glsl", sizeof(g_defaults.shader_dir));
fill_pathname_join(g_defaults.overlay_dir, path, "overlays", sizeof(g_defaults.overlay_dir));
fill_pathname_join(g_defaults.core_dir, path, "cores", sizeof(g_defaults.core_dir));
fill_pathname_join(g_defaults.core_info_dir, path, "info", sizeof(g_defaults.core_info_dir));
}
}
}

2
settings.c
View File

@ -507,7 +507,7 @@ void config_set_defaults(void)
if (*g_defaults.assets_dir)
strlcpy(g_settings.assets_directory, g_defaults.assets_dir, sizeof(g_settings.assets_directory));
if (*g_defaults.core_dir)
strlcpy(g_settings.libretro_directory, g_defaults.core_dir, sizeof(g_settings.libretro_directory));
fill_pathname_expand_special(g_settings.libretro_directory, g_defaults.core_dir, sizeof(g_settings.libretro_directory));
if (*g_defaults.core_path)
strlcpy(g_settings.libretro, g_defaults.core_path, sizeof(g_settings.libretro));
if (*g_defaults.core_info_dir)