mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Apple) Get rid of globalConfigFile

Browse Source
This commit is contained in:
Twinaphex 2014-07-19 22:17:42 +02:00
parent ba99ec92ee
commit 3242cc998a
5 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apple/OSX/platform.h
View File

@ -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;

4
apple/OSX/platform.m
View File

@ -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

1
apple/common/RetroArch_Apple.h
View File

@ -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

2
apple/common/main.m
View File

@ -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 };

4
apple/iOS/menu.m
View File

@ -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);
}