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

(iOS) Buildfix

Browse Source
This commit is contained in:
Twinaphex 2015-05-06 00:04:48 +02:00
parent 4402685627
commit e3dc04d602
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ui/drivers/cocoa/cocoatouch_menu.m
View File

@ -351,13 +351,12 @@ typedef struct ios_menu_item
char description[PATH_MAX_LENGTH]; char description[PATH_MAX_LENGTH];
} ios_menu_item_t; } ios_menu_item_t;
static id *menu_item_init(ios_menu_item_t *item, unsigned type) static void *menu_item_init(ios_menu_item_t *item, unsigned type)
{ {
switch (type) switch (type)
{ {
case MENU_ITEM_BASIC: case MENU_ITEM_BASIC:
return [RAMenuItemBasic itemWithDescription:BOXSTRING(item->description) return (__bridge void*)[RAMenuItemBasic itemWithDescription:BOXSTRING(item->description) action:^{}];
action:^{}]
} }
return nil; return nil;
@ -377,14 +376,14 @@ static id *menu_item_init(ios_menu_item_t *item, unsigned type)
+ (id)itemForSetting:(rarch_setting_t*)setting action:(void (^)())action + (id)itemForSetting:(rarch_setting_t*)setting action:(void (^)())action
{ {
ios_menu_item_t item; ios_menu_item_t menu_item;
switch (setting->type) switch (setting->type)
{ {
case ST_NONE: case ST_NONE:
case ST_ACTION: case ST_ACTION:
strlcpy(item.description, "Shouldn't be called with ST_NONE or ST_ACTION", sizeof(item.description)); strlcpy(menu_item.description, "Shouldn't be called with ST_NONE or ST_ACTION", sizeof(menu_item.description));
return menu_item_init(&item, MENU_ITEM_BASIC); return (__bridge RAMenuItemBasic*)menu_item_init(&menu_item, MENU_ITEM_BASIC);
case ST_BOOL: case ST_BOOL:
return [[RAMenuItemBooleanSetting alloc] initWithSetting:setting action:action]; return [[RAMenuItemBooleanSetting alloc] initWithSetting:setting action:action];
case ST_INT: case ST_INT:
@ -404,8 +403,8 @@ static id *menu_item_init(ios_menu_item_t *item, unsigned type)
case ST_END_GROUP: case ST_END_GROUP:
case ST_END_SUB_GROUP: case ST_END_SUB_GROUP:
default: default:
strlcpy(item.description, "Shouldn't be called with ST_GROUP", sizeof(item.description)); strlcpy(menu_item.description, "Shouldn't be called with ST_GROUP", sizeof(menu_item.description));
return menu_item_init(&item, MENU_ITEM_BASIC); return (__bridge RAMenuItemBasic*)menu_item_init(&menu_item, MENU_ITEM_BASIC);
} }
if (setting->type == ST_STRING && setting->values) if (setting->type == ST_STRING && setting->values)