From d551b007876b910b1a0e4bd807f3e584a8cf2b40 Mon Sep 17 00:00:00 2001 From: radius Date: Thu, 8 Sep 2016 23:56:43 -0500 Subject: [PATCH] emscripten and psp frontend driver cleanups --- frontend/drivers/platform_emscripten.c | 9 +++++---- frontend/drivers/platform_psp.c | 7 ++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/frontend/drivers/platform_emscripten.c b/frontend/drivers/platform_emscripten.c index 84fb7d6893..7b683bd6cf 100644 --- a/frontend/drivers/platform_emscripten.c +++ b/frontend/drivers/platform_emscripten.c @@ -98,7 +98,7 @@ static void frontend_emscripten_get_env(int *argc, char *argv[], fill_pathname_join(g_defaults.dir.core, base_path, "cores", sizeof(g_defaults.dir.core)); - /* data from the retroarch bundle */ + /* bundle data */ fill_pathname_join(g_defaults.dir.assets, base_path, "bundle/assets", sizeof(g_defaults.dir.assets)); fill_pathname_join(g_defaults.dir.autoconfig, base_path, @@ -122,7 +122,7 @@ static void frontend_emscripten_get_env(int *argc, char *argv[], fill_pathname_join(g_defaults.dir.menu_config, user_path, "config", sizeof(g_defaults.dir.menu_config)); fill_pathname_join(g_defaults.dir.menu_content, user_path, - "content", sizeof(g_defaults.dir.thumbnails)); + "content", sizeof(g_defaults.dir.menu_content)); fill_pathname_join(g_defaults.dir.core_assets, user_path, "downloads", sizeof(g_defaults.dir.core_assets)); fill_pathname_join(g_defaults.dir.playlist, user_path, @@ -141,9 +141,10 @@ static void frontend_emscripten_get_env(int *argc, char *argv[], "thumbnails", sizeof(g_defaults.dir.thumbnails)); /* cache dir */ - fill_pathname_join(g_defaults.dir.cache, "/tmp/retroarch/", - "system", sizeof(g_defaults.dir.system)); + fill_pathname_join(g_defaults.dir.cache, "/tmp/", + "retroarch", sizeof(g_defaults.dir.cache)); + /* history and main config */ strlcpy(g_defaults.dir.content_history, user_path, sizeof(g_defaults.dir.content_history)); fill_pathname_join(g_defaults.path.config, user_path, diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c index 9fe2ec1fb1..fe66853422 100644 --- a/frontend/drivers/platform_psp.c +++ b/frontend/drivers/platform_psp.c @@ -139,6 +139,7 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[], "CORES", sizeof(g_defaults.dir.core)); fill_pathname_join(g_defaults.dir.core_info, g_defaults.dir.port, "INFO", sizeof(g_defaults.dir.core_info)); + /* user data */ fill_pathname_join(g_defaults.dir.cheats, user_path, "CHEATS", sizeof(g_defaults.dir.cheats)); @@ -148,7 +149,7 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[], "DOWNLOADS", sizeof(g_defaults.dir.core_assets)); fill_pathname_join(g_defaults.dir.playlist, user_path, "PLAYLISTS", sizeof(g_defaults.dir.playlist)); - fill_pathname_join(g_defaults.dir.remap, user_path, + fill_pathname_join(g_defaults.dir.remap, g_defaults.dir.menu_config, "REMAPS", sizeof(g_defaults.dir.remap)); fill_pathname_join(g_defaults.dir.sram, user_path, "SAVEFILES", sizeof(g_defaults.dir.sram)); @@ -158,8 +159,12 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[], "SCREENSHOTS", sizeof(g_defaults.dir.screenshot)); fill_pathname_join(g_defaults.dir.system, user_path, "SYSTEM", sizeof(g_defaults.dir.system)); + + /* cache dir */ fill_pathname_join(g_defaults.dir.cache, user_path, "TEMP", sizeof(g_defaults.dir.cache)); + + /* history and main config */ strlcpy(g_defaults.dir.content_history, user_path, sizeof(g_defaults.dir.content_history)); fill_pathname_join(g_defaults.path.config, user_path,