From 6c243ef6fe011af0f83a6c789e8a15c26cf1d09a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 2 May 2016 13:23:47 +0200 Subject: [PATCH] Cleanups --- configuration.c | 6 ++--- file_path_special.c | 2 +- frontend/drivers/platform_darwin.m | 43 ++++++++++++++---------------- 3 files changed, 23 insertions(+), 28 deletions(-) diff --git a/configuration.c b/configuration.c index d92d098bb0..841051d8b2 100644 --- a/configuration.c +++ b/configuration.c @@ -1008,11 +1008,9 @@ static config_file_t *open_default_config_file(void) sizeof(application_data))) return NULL; - fill_pathname_join(conf_path, application_data, - "RetroArch", sizeof(conf_path)); - path_mkdir(conf_path); + path_mkdir(application_data); - fill_pathname_join(conf_path, conf_path, + fill_pathname_join(conf_path, application_data, "retroarch.cfg", sizeof(conf_path)); conf = config_file_new(conf_path); diff --git a/file_path_special.c b/file_path_special.c index 125d6bd35c..08b74ae809 100644 --- a/file_path_special.c +++ b/file_path_special.c @@ -158,7 +158,7 @@ bool fill_pathname_application_data(char *s, size_t len) if (appdata) { fill_pathname_join(s, appdata, - "Library/Application Support", len); + "Library/Application Support/RetroArch", len); return true; } #elif !defined(RARCH_CONSOLE) diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m index 8f5b062689..f6a7e409a4 100644 --- a/frontend/drivers/platform_darwin.m +++ b/frontend/drivers/platform_darwin.m @@ -374,35 +374,32 @@ static void frontend_darwin_get_environment_settings(int *argc, char *argv[], fill_pathname_join(g_defaults.dir.playlist, home_dir_buf, "playlists", sizeof(g_defaults.dir.playlist)); #endif #if defined(OSX) - char application_data_root_dir[PATH_MAX_LENGTH]; - char application_data[PATH_MAX_LENGTH]; - - fill_pathname_application_data(application_data, sizeof(application_data)); - fill_pathname_join(application_data_root_dir, - application_data, "RetroArch", sizeof(application_data_root_dir)); - + char application_data[PATH_MAX_LENGTH]; + + fill_pathname_application_data(application_data, sizeof(application_data)); + #ifdef HAVE_CG fill_pathname_join(g_defaults.dir.shader, home_dir_buf, "shaders_cg", sizeof(g_defaults.dir.shader)); #endif fill_pathname_join(g_defaults.dir.audio_filter, home_dir_buf, "audio_filters", sizeof(g_defaults.dir.audio_filter)); fill_pathname_join(g_defaults.dir.video_filter, home_dir_buf, "video_filters", sizeof(g_defaults.dir.video_filter)); - fill_pathname_join(g_defaults.dir.playlist, application_data_root_dir, "playlists", sizeof(g_defaults.dir.playlist)); - fill_pathname_join(g_defaults.dir.menu_config, application_data_root_dir, "configs", sizeof(g_defaults.dir.menu_config)); - fill_pathname_join(g_defaults.path.config, g_defaults.dir.menu_config, "retroarch.cfg", sizeof(g_defaults.path.config)); - fill_pathname_join(g_defaults.dir.thumbnails, application_data_root_dir, "thumbnails", sizeof(g_defaults.dir.thumbnails)); - fill_pathname_join(g_defaults.dir.remap, application_data_root_dir, "remaps", sizeof(g_defaults.dir.remap)); - fill_pathname_join(g_defaults.dir.core_assets, application_data_root_dir, "downloads", sizeof(g_defaults.dir.core_assets)); - fill_pathname_join(g_defaults.dir.screenshot, application_data_root_dir, "screenshots", sizeof(g_defaults.dir.screenshot)); + fill_pathname_join(g_defaults.dir.playlist, application_data, "playlists", sizeof(g_defaults.dir.playlist)); + fill_pathname_join(g_defaults.dir.menu_config, application_data, "configs", sizeof(g_defaults.dir.menu_config)); + fill_pathname_join(g_defaults.path.config, g_defaults.dir.menu_config, "retroarch.cfg", sizeof(g_defaults.path.config)); + fill_pathname_join(g_defaults.dir.thumbnails, application_data, "thumbnails", sizeof(g_defaults.dir.thumbnails)); + fill_pathname_join(g_defaults.dir.remap, application_data, "remaps", sizeof(g_defaults.dir.remap)); + fill_pathname_join(g_defaults.dir.core_assets, application_data, "downloads", sizeof(g_defaults.dir.core_assets)); + fill_pathname_join(g_defaults.dir.screenshot, application_data, "screenshots", sizeof(g_defaults.dir.screenshot)); #if defined(RELEASE_BUILD) - fill_pathname_join(g_defaults.dir.shader, bundle_path_buf, "Contents/Resources/shaders", sizeof(g_defaults.dir.shader)); - fill_pathname_join(g_defaults.dir.core, bundle_path_buf, "Contents/Resources/cores", sizeof(g_defaults.dir.core)); - fill_pathname_join(g_defaults.dir.core_info, bundle_path_buf, "Contents/Resources/info", sizeof(g_defaults.dir.core_info)); - fill_pathname_join(g_defaults.dir.overlay, bundle_path_buf, "Contents/Resources/overlays", sizeof(g_defaults.dir.overlay)); - fill_pathname_join(g_defaults.dir.autoconfig, bundle_path_buf, "Contents/Resources/autoconfig", sizeof(g_defaults.dir.autoconfig)); - fill_pathname_join(g_defaults.dir.assets, bundle_path_buf, "Contents/Resources/assets", sizeof(g_defaults.dir.assets)); - fill_pathname_join(g_defaults.dir.database, bundle_path_buf, "Contents/Resources/database/rdb", sizeof(g_defaults.dir.database)); - fill_pathname_join(g_defaults.dir.cursor, bundle_path_buf, "Contents/Resources/database/cursors", sizeof(g_defaults.dir.cursor)); - fill_pathname_join(g_defaults.dir.cheats, bundle_path_buf, "Contents/Resources/cht", sizeof(g_defaults.dir.cheats)); + fill_pathname_join(g_defaults.dir.shader, bundle_path_buf, "Contents/Resources/shaders", sizeof(g_defaults.dir.shader)); + fill_pathname_join(g_defaults.dir.core, bundle_path_buf, "Contents/Resources/cores", sizeof(g_defaults.dir.core)); + fill_pathname_join(g_defaults.dir.core_info, bundle_path_buf, "Contents/Resources/info", sizeof(g_defaults.dir.core_info)); + fill_pathname_join(g_defaults.dir.overlay, bundle_path_buf, "Contents/Resources/overlays", sizeof(g_defaults.dir.overlay)); + fill_pathname_join(g_defaults.dir.autoconfig, bundle_path_buf, "Contents/Resources/autoconfig", sizeof(g_defaults.dir.autoconfig)); + fill_pathname_join(g_defaults.dir.assets, bundle_path_buf, "Contents/Resources/assets", sizeof(g_defaults.dir.assets)); + fill_pathname_join(g_defaults.dir.database, bundle_path_buf, "Contents/Resources/database/rdb", sizeof(g_defaults.dir.database)); + fill_pathname_join(g_defaults.dir.cursor, bundle_path_buf, "Contents/Resources/database/cursors", sizeof(g_defaults.dir.cursor)); + fill_pathname_join(g_defaults.dir.cheats, bundle_path_buf, "Contents/Resources/cht", sizeof(g_defaults.dir.cheats)); #endif #endif