mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-25 09:02:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

(OSX/iOS) Build fixes for changes in setting_data_get_list

Browse Source
This commit is contained in:
Twinaphex 2014-10-08 02:42:41 +02:00
parent da3734e8c7
commit 3ce378d264
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apple/OSX/settings.m
View File

@ -128,7 +128,7 @@ NSWindowDelegate>
NSMutableArray* thisGroup = nil; NSMutableArray* thisGroup = nil;
NSMutableArray* thisSubGroup = nil; NSMutableArray* thisSubGroup = nil;
self.settings = [NSMutableArray array]; self.settings = [NSMutableArray array];
setting_data = (const rarch_setting_t *)setting_data_get_list(true); setting_data = (const rarch_setting_t *)setting_data_get_list(SL_FLAG_ALL_SETTINGS, true);
for (i = 0; setting_data[i].type; i ++) for (i = 0; setting_data[i].type; i ++)
{ {
@ -246,7 +246,7 @@ NSWindowDelegate>
{ {
char buffer[PATH_MAX]; char buffer[PATH_MAX];
rarch_setting_t* setting_data, *setting = NULL; rarch_setting_t* setting_data, *setting = NULL;
setting_data = (rarch_setting_t*)setting_data_get_list(false); setting_data = (rarch_setting_t*)setting_data_get_list(SL_FLAG_ALL_SETTINGS, false);
setting = (rarch_setting_t*)&setting_data[[item intValue]]; setting = (rarch_setting_t*)&setting_data[[item intValue]];
if ([[tableColumn identifier] isEqualToString:BOXSTRING("left")]) if ([[tableColumn identifier] isEqualToString:BOXSTRING("left")])
@ -282,7 +282,8 @@ NSWindowDelegate>
if ([[tableColumn identifier] isEqualToString:BOXSTRING("left")]) if ([[tableColumn identifier] isEqualToString:BOXSTRING("left")])
return [tableColumn dataCell]; return [tableColumn dataCell];
setting_data = (const rarch_setting_t *)setting_data_get_list(false); setting_data = (const rarch_setting_t *)
setting_data_get_list(SL_FLAG_ALL_SETTINGS, false);
setting = (const rarch_setting_t *)&setting_data[[item intValue]]; setting = (const rarch_setting_t *)&setting_data[[item intValue]];
switch (setting->type) switch (setting->type)
@ -304,7 +305,8 @@ NSWindowDelegate>
if ([item isKindOfClass:[NSNumber class]]) if ([item isKindOfClass:[NSNumber class]])
{ {
rarch_setting_t *setting_data = (rarch_setting_t*)setting_data_get_list(false); rarch_setting_t *setting_data = (rarch_setting_t*)setting_data_get_list(
SL_FLAG_ALL_SETTINGS, false);
rarch_setting_t *setting = (rarch_setting_t*)&setting_data[[item intValue]]; rarch_setting_t *setting = (rarch_setting_t*)&setting_data[[item intValue]];
switch (setting->type) switch (setting->type)
@ -334,7 +336,7 @@ NSWindowDelegate>
if ([item isKindOfClass:[NSNumber class]]) if ([item isKindOfClass:[NSNumber class]])
{ {
rarch_setting_t *setting_data = (rarch_setting_t *)setting_data_get_list(false); rarch_setting_t *setting_data = (rarch_setting_t *)setting_data_get_list(SL_FLAG_ALL_SETTINGS, false);
rarch_setting_t *setting = (rarch_setting_t*)&setting_data[[item intValue]]; rarch_setting_t *setting = (rarch_setting_t*)&setting_data[[item intValue]];
NSString *editor_string = (NSString*)editor.string; NSString *editor_string = (NSString*)editor.string;

4
apple/iOS/menu.m
View File

@ -808,7 +808,7 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
_pathToSave = BOXSTRING(g_defaults.config_path); _pathToSave = BOXSTRING(g_defaults.config_path);
} }
setting_data = (rarch_setting_t*)setting_data_get_list(true); setting_data = (rarch_setting_t*)setting_data_get_list(SL_FLAG_ALL_SETTINGS, true);
setting_data_load_config_path(setting_data, _pathToSave.UTF8String); setting_data_load_config_path(setting_data, _pathToSave.UTF8String);
// HACK: Load the key mapping table // HACK: Load the key mapping table
@ -858,7 +858,7 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
if (config) if (config)
{ {
setting_data_save_config(setting_data_get_list(false), config); setting_data_save_config(setting_data_get_list(SL_FLAG_ALL_SETTINGS, false), config);
config_file_write(config, self.pathToSave.UTF8String); config_file_write(config, self.pathToSave.UTF8String);
config_file_free(config); config_file_free(config);
} }