From 8d8fb6f988cc8493ce20b6a01c0750c4f5c90cfd Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 26 Apr 2014 21:48:42 +0200 Subject: [PATCH] (Apple) Build fix --- apple/OSX/platform.m | 8 ++++---- apple/common/main.m | 4 ++-- apple/common/utility.m | 4 ++-- apple/iOS/menu.m | 28 ++++++++++++++-------------- apple/iOS/platform.m | 6 +++--- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/apple/OSX/platform.m b/apple/OSX/platform.m index bfa842148b..84ce28769c 100644 --- a/apple/OSX/platform.m +++ b/apple/OSX/platform.m @@ -152,11 +152,11 @@ static char** waiting_argv; // Create core select list NSComboBox* cb = (NSComboBox*)[[self.coreSelectSheet contentView] viewWithTag:1]; - apple_core_info_set_core_path(self.coreDirectory.UTF8String); - apple_core_info_set_config_path(self.configDirectory.UTF8String); - const core_info_list_t* cores = (const core_info_list_t*)apple_core_info_list_get(); + core_info_set_core_path(self.coreDirectory.UTF8String); + core_info_set_config_path(self.configDirectory.UTF8String); + const core_info_list_t* cores = (const core_info_list_t*)core_info_list_get(); - for (int i = 0; cores && i != cores->count; i ++) + for (int i = 0; cores && i < cores->count; i ++) { NSString* desc = (NSString*)BOXSTRING(cores->list[i].display_name); #if defined(MAC_OS_X_VERSION_10_6) diff --git a/apple/common/main.m b/apple/common/main.m index f453d3a691..49dacbe5e9 100644 --- a/apple/common/main.m +++ b/apple/common/main.m @@ -109,8 +109,8 @@ void apple_run_core(NSString* core, const char* file) #ifdef IOS static char config_path[PATH_MAX]; - if (apple_core_info_has_custom_config(apple_core.UTF8String)) - apple_core_info_get_custom_config(apple_core.UTF8String, config_path, sizeof(config_path)); + 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)); diff --git a/apple/common/utility.m b/apple/common/utility.m index a8ef9936a2..9367d50a5d 100644 --- a/apple/common/utility.m +++ b/apple/common/utility.m @@ -60,12 +60,12 @@ NSString* objc_get_value_from_config(config_file_t* config, NSString* name, NSSt NSString *apple_get_core_id(const core_info_t *core) { char buf[PATH_MAX]; - return BOXSTRING(apple_core_info_get_id(core, buf, sizeof(buf))); + return BOXSTRING(core_info_get_id(core, buf, sizeof(buf))); } NSString *apple_get_core_display_name(NSString *core_id) { - const core_info_t *core = (const core_info_t*)apple_core_info_list_get_by_id(core_id.UTF8String); + const core_info_t *core = (const core_info_t*)core_info_list_get_by_id(core_id.UTF8String); return core ? BOXSTRING(core->display_name) : core_id; } diff --git a/apple/iOS/menu.m b/apple/iOS/menu.m index 563c2e684c..4991be93ef 100644 --- a/apple/iOS/menu.m +++ b/apple/iOS/menu.m @@ -646,12 +646,12 @@ static void RunActionSheet(const char* title, const struct string_list* items, U RAHistoryMenu* __weak weakSelf = self; NSMutableArray* section = [NSMutableArray arrayWithObject:@""]; - for (int i = 0; _history && i != rom_history_size(_history); i ++) + for (int i = 0; _history && i < rom_history_size(_history); i ++) { - RAMenuItemBasic* item = [RAMenuItemBasic itemWithDescription:BOXSTRING(path_basename(apple_rom_history_get_path(weakSelf.history, i))) - action:^{ apple_run_core(BOXSTRING(apple_rom_history_get_core_path(weakSelf.history, i)), - apple_rom_history_get_path(weakSelf.history, i)); } - detail:^{ return BOXSTRING(apple_rom_history_get_core_name(weakSelf.history, i)); }]; + RAMenuItemBasic* item = [RAMenuItemBasic itemWithDescription:BOXSTRING(path_basename(rom_history_get_path(weakSelf.history, i))) + action:^{ apple_run_core(BOXSTRING(rom_history_get_core_path(weakSelf.history, i)), + rom_history_get_path(weakSelf.history, i)); } + detail:^{ return BOXSTRING(rom_history_get_core_name(weakSelf.history, i)); }]; [section addObject:item]; } @@ -716,12 +716,12 @@ static void RunActionSheet(const char* title, const struct string_list* items, U if ((self = [super initWithStyle:UITableViewStyleGrouped])) { - _isCustom = apple_core_info_has_custom_config(core.UTF8String); + _isCustom = core_info_has_custom_config(core.UTF8String); if (_isCustom) { self.title = apple_get_core_display_name(core); - _pathToSave = BOXSTRING(apple_core_info_get_custom_config(core.UTF8String, buffer, sizeof(buffer))); + _pathToSave = BOXSTRING(core_info_get_custom_config(core.UTF8String, buffer, sizeof(buffer))); self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemTrash target:self action:@selector(deleteCustom)]; } else @@ -855,11 +855,11 @@ static void RunActionSheet(const char* title, const struct string_list* items, U [cores addObject:[RAMenuItemBasic itemWithDescription:@"New Config for Core" action: ^{ [weakSelf createNewConfig]; }]]; - const core_info_list_t* core_list = apple_core_info_list_get(); + const core_info_list_t* core_list = (const core_info_list_t*)core_info_list_get(); for (int i = 0; i < core_list->count; i ++) { NSString* core_id = (NSString*)apple_get_core_id(&core_list->list[i]); - if (apple_core_info_has_custom_config(core_id.UTF8String)) + if (core_info_has_custom_config(core_id.UTF8String)) { [cores addObject:[RAMenuItemBasic itemWithDescription:BOXSTRING(core_list->list[i].display_name) association:core_id @@ -886,10 +886,10 @@ static void RunActionSheet(const char* title, const struct string_list* items, U RAMenuCoreList* list = [[RAMenuCoreList alloc] initWithPath:nil allowAutoDetect:false action:^(NSString* core) { - if (!apple_core_info_has_custom_config(core.UTF8String)) + if (!core_info_has_custom_config(core.UTF8String)) { char path[PATH_MAX]; - apple_core_info_get_custom_config(core.UTF8String, path, sizeof(path)); + core_info_get_custom_config(core.UTF8String, path, sizeof(path)); if (![[NSFileManager defaultManager] copyItemAtPath:apple_platform.globalConfigFile toPath:BOXSTRING(path) error:nil]) RARCH_WARN("Could not create custom config at %s", path); @@ -1022,14 +1022,14 @@ static void RunActionSheet(const char* title, const struct string_list* items, U if (autoDetect) { RAMenuCoreList* __weak weakSelf = self; - [self.sections addObject: @[@"", [RAMenuItemBasic itemWithDescription:@"Auto Detect" + [self.sections addObject: @[BOXSTRING(""), [RAMenuItemBasic itemWithDescription:BOXSTRING("Auto Detect") action: ^{ if(weakSelf.action) weakSelf.action(nil); }]]]; } - NSMutableArray* core_section = (NSMutableArray*)[NSMutableArray arrayWithObject:@"Cores"]; + NSMutableArray* core_section = (NSMutableArray*)[NSMutableArray arrayWithObject:BOXSTRING("Cores")]; [self.sections addObject:core_section]; - core_info_list_t* core_list = apple_core_info_list_get(); + core_info_list_t* core_list = (core_info_list_t*)core_info_list_get(); if (core_list) { if (_path) diff --git a/apple/iOS/platform.m b/apple/iOS/platform.m index 451a8cecdf..289bc9bb13 100644 --- a/apple/iOS/platform.m +++ b/apple/iOS/platform.m @@ -250,10 +250,10 @@ static void handle_touch_event(NSArray* touches) } // Warn if there are no cores present - apple_core_info_set_core_path([self.coreDirectory UTF8String]); - apple_core_info_set_config_path([self.configDirectory UTF8String]); + core_info_set_core_path([self.coreDirectory UTF8String]); + core_info_set_config_path([self.configDirectory UTF8String]); - const core_info_list_t* core_list = (const core_info_list_t*)apple_core_info_list_get(); + const core_info_list_t* core_list = (const core_info_list_t*)core_info_list_get(); if (!core_list || core_list->count == 0) apple_display_alert(@"No libretro cores were found. You will not be able to run any content.", 0);