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) Build fix

Browse Source
This commit is contained in:
Twinaphex 2014-07-22 02:21:23 +02:00
parent 4b0f3584e0
commit 5db9e93aea
4 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apple/OSX/platform.m
View File

@ -317,10 +317,11 @@ static char** waiting_argv;
- (IBAction)basicEvent:(id)sender
{
unsigned cmd = (unsigned)[sender tag];
if (!g_extern.main_is_init)
return;
apple_event_basic_command([sender tag]);
rarch_main_command(cmd);
}
- (void)alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo

1
apple/common/apple_export.h
View File

@ -19,7 +19,6 @@
#include <stdint.h>
extern void apple_event_basic_command(enum basic_event_t action);
extern void apple_refresh_config(void);
#endif

12
apple/iOS/menu.m
View File

@ -529,14 +529,14 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
if (g_extern.main_is_init)
{
[self.sections addObject:[NSArray arrayWithObjects:BOXSTRING("Actions"),
[RAMenuItemBasic itemWithDescription:BOXSTRING("Reset Content") action:^{ [weakSelf performBasicAction:RESET]; }],
[RAMenuItemBasic itemWithDescription:BOXSTRING("Close Content") action:^{ [weakSelf performBasicAction:QUIT]; }],
[RAMenuItemBasic itemWithDescription:BOXSTRING("Reset Content") action:^{ [weakSelf performBasicAction:RARCH_CMD_RESET]; }],
[RAMenuItemBasic itemWithDescription:BOXSTRING("Close Content") action:^{ [weakSelf performBasicAction:RARCH_CMD_QUIT]; }],
nil]];
[self.sections addObject:[NSArray arrayWithObjects:BOXSTRING("States"),
[RAMenuItemStateSelect new],
[RAMenuItemBasic itemWithDescription:BOXSTRING("Load State") action:^{ [weakSelf performBasicAction:LOAD_STATE]; }],
[RAMenuItemBasic itemWithDescription:BOXSTRING("Save State") action:^{ [weakSelf performBasicAction:SAVE_STATE]; }],
[RAMenuItemBasic itemWithDescription:BOXSTRING("Load State") action:^{ [weakSelf performBasicAction:RARCH_CMD_LOAD_STATE]; }],
[RAMenuItemBasic itemWithDescription:BOXSTRING("Save State") action:^{ [weakSelf performBasicAction:RARCH_CMD_SAVE_STATE]; }],
nil]];
[settings addObject:[RAMenuItemBasic itemWithDescription:BOXSTRING("Core")
@ -577,10 +577,10 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
self.navigationItem.leftBarButtonItem = nil;
}
- (void)performBasicAction:(enum basic_event_t)action
- (void)performBasicAction:(unsigned)action
{
[[RetroArch_iOS get] showGameView];
apple_event_basic_command(action);
rarch_main_command(action);
}
- (void)chooseCoreWithPath:(NSString*)path

19
frontend/platform/platform_apple.c
View File

@ -63,25 +63,6 @@ void apple_stop_iteration(void)
iterate_observer = 0;
}
void apple_event_basic_command(enum basic_event_t action)
{
switch (action)
{
case RESET:
rarch_game_reset();
return;
case LOAD_STATE:
rarch_load_state();
return;
case SAVE_STATE:
rarch_save_state();
return;
case QUIT:
g_extern.system.shutdown = true;
return;
}
}
static int frontend_apple_get_rating(void)
{
/* TODO/FIXME - look at unique identifier per device and