diff --git a/apple/OSX/platform.h b/apple/OSX/platform.h index bcee769327..36c3356613 100644 --- a/apple/OSX/platform.h +++ b/apple/OSX/platform.h @@ -36,7 +36,6 @@ { NSWindow* _window; NSString* _configDirectory; - NSString* _globalConfigFile; NSString* _coreDirectory; NSWindowController* _settingsWindow; NSWindow* _coreSelectSheet; @@ -49,7 +48,6 @@ @property (nonatomic, retain) NSWindow IBOutlet* window; @property (nonatomic, copy) NSString* configDirectory; // e.g. /var/mobile/Documents/.RetroArch -@property (nonatomic, copy) NSString* globalConfigFile; // e.g. /var/mobile/Documents/.RetroArch/retroarch.cfg @property (nonatomic, copy) NSString* coreDirectory; // e.g. /Applications/RetroArch.app/modules + (RetroArch_OSX*)get; diff --git a/apple/OSX/platform.m b/apple/OSX/platform.m index 72ada4a3e5..fb34285fa8 100644 --- a/apple/OSX/platform.m +++ b/apple/OSX/platform.m @@ -102,7 +102,6 @@ static char** waiting_argv; @synthesize window = _window; @synthesize configDirectory = _configDirectory; -@synthesize globalConfigFile = _globalConfigFile; @synthesize coreDirectory = _coreDirectory; @synthesize settingsWindow = _settingsWindow; @synthesize coreSelectSheet = _coreSelectSheet; @@ -113,7 +112,6 @@ static char** waiting_argv; { [_window release]; [_configDirectory release]; - [_globalConfigFile release]; [_coreDirectory release]; [_coreSelectSheet release]; [_settingsWindow release]; @@ -139,7 +137,7 @@ static char** waiting_argv; paths = (NSArray*)NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES); self.configDirectory = [[paths objectAtIndex:0] stringByAppendingPathComponent:BOXSTRING("RetroArch")]; - self.globalConfigFile = [NSString stringWithFormat:BOXSTRING("%@/retroarch.cfg"), self.configDirectory]; + snprintf(g_defaults.config_path, sizeof(g_defaults.config_path), "%s/retroarch.cfg", self.configDirectory.UTF8String); self.coreDirectory = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:BOXSTRING("Contents/Resources/modules")]; #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 diff --git a/apple/common/RetroArch_Apple.h b/apple/common/RetroArch_Apple.h index 277d21a4fc..8f7de4e235 100644 --- a/apple/common/RetroArch_Apple.h +++ b/apple/common/RetroArch_Apple.h @@ -32,7 +32,6 @@ - (void)unloadingCore:(NSString*)core; - (NSString*)configDirectory; // < This returns the directory that contains retroarch.cfg and other custom configs -- (NSString*)globalConfigFile; // < This is the full path to retroarch.cfg - (NSString*)coreDirectory; // < This is the default path to where libretro cores are installed @end diff --git a/apple/common/main.m b/apple/common/main.m index 47bf56346e..9c2cd20da9 100644 --- a/apple/common/main.m +++ b/apple/common/main.m @@ -55,7 +55,7 @@ void apple_run_core(NSString* core, const char* file) if (core_info_has_custom_config(apple_core.UTF8String)) core_info_get_custom_config(apple_core.UTF8String, config_path, sizeof(config_path)); else - strlcpy(config_path, apple_platform.globalConfigFile.UTF8String, sizeof(config_path)); + strlcpy(config_path, g_defaults.config_path, sizeof(config_path)); static const char* const argv_game[] = { "retroarch", "-c", config_path, "-L", core_path, file_path, 0 }; static const char* const argv_menu[] = { "retroarch", "-c", config_path, "--menu", 0 }; diff --git a/apple/iOS/menu.m b/apple/iOS/menu.m index 846b6f6914..2ab4ecac79 100644 --- a/apple/iOS/menu.m +++ b/apple/iOS/menu.m @@ -745,7 +745,7 @@ static void RunActionSheet(const char* title, const struct string_list* items, U else { self.title = BOXSTRING("Global Core Config"); - _pathToSave = apple_platform.globalConfigFile; + _pathToSave = BOXSTRING(g_defaults.config_path); } setting_data = (rarch_setting_t*)setting_data_get_list(); @@ -910,7 +910,7 @@ static void RunActionSheet(const char* title, const struct string_list* items, U char path[PATH_MAX]; core_info_get_custom_config(core.UTF8String, path, sizeof(path)); - if (![[NSFileManager defaultManager] copyItemAtPath:apple_platform.globalConfigFile toPath:BOXSTRING(path) error:nil]) + if (![[NSFileManager defaultManager] copyItemAtPath:BOXSTRING(g_defaults.config_path) toPath:BOXSTRING(path) error:nil]) RARCH_WARN("Could not create custom config at %s", path); }