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

Rename frontend_ctx_apple to frontend_ctx_darwin

Browse Source
This commit is contained in:
twinaphex 2015-04-20 17:19:51 +02:00
parent aa54f7fb41
commit 7ed40b4401
5 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.common
View File

@ -259,8 +259,8 @@ ifeq ($(HAVE_AL), 1)
endif
endif
ifeq ($(OSX), 1)
OBJ += frontend/drivers/platform_apple.o
ifneq ($(findstring Darwin,$(OS)),)
OBJ += frontend/drivers/platform_darwin.o
endif
ifeq ($(HAVE_JACK),1)

34
frontend/drivers/platform_apple.m → frontend/drivers/platform_darwin.m
View File

@ -266,7 +266,7 @@ static void checkps(CFDictionaryRef dict, bool * have_ac, bool * have_battery,
}
#endif
static void frontend_apple_get_name(char *name, size_t sizeof_name)
static void frontend_darwin_get_name(char *name, size_t sizeof_name)
{
#if defined(IOS)
struct utsname buffer;
@ -281,7 +281,7 @@ static void frontend_apple_get_name(char *name, size_t sizeof_name)
#endif
}
static void frontend_apple_get_os(char *name, size_t sizeof_name, int *major, int *minor)
static void frontend_darwin_get_os(char *name, size_t sizeof_name, int *major, int *minor)
{
(void)name;
(void)sizeof_name;
@ -296,7 +296,7 @@ static void frontend_apple_get_os(char *name, size_t sizeof_name, int *major, in
#endif
}
static void frontend_apple_get_environment_settings(int *argc, char *argv[],
static void frontend_darwin_get_environment_settings(int *argc, char *argv[],
void *args, void *params_data)
{
char temp_dir[PATH_MAX_LENGTH];
@ -365,7 +365,7 @@ static void frontend_apple_get_environment_settings(int *argc, char *argv[],
CFRelease(bundle_url);
}
static void frontend_apple_load_content(void)
static void frontend_darwin_load_content(void)
{
driver_t *driver = driver_get_ptr();
const ui_companion_driver_t *ui = ui_companion_get_ptr();
@ -374,11 +374,11 @@ static void frontend_apple_load_content(void)
ui->notify_content_loaded(driver->ui_companion_data);
}
static int frontend_apple_get_rating(void)
static int frontend_darwin_get_rating(void)
{
char model[PATH_MAX_LENGTH];
frontend_apple_get_name(model, sizeof(model));
frontend_darwin_get_name(model, sizeof(model));
/* iPhone 4 */
#if 0
@ -439,7 +439,7 @@ static int frontend_apple_get_rating(void)
return -1;
}
static enum frontend_powerstate frontend_apple_get_powerstate(int *seconds, int *percent)
static enum frontend_powerstate frontend_darwin_get_powerstate(int *seconds, int *percent)
{
enum frontend_powerstate ret = FRONTEND_POWERSTATE_NONE;
#if defined(OSX)
@ -493,7 +493,7 @@ end:
return ret;
}
enum frontend_architecture frontend_apple_get_architecture(void)
enum frontend_architecture frontend_darwin_get_architecture(void)
{
struct utsname buffer;
@ -512,8 +512,8 @@ enum frontend_architecture frontend_apple_get_architecture(void)
return FRONTEND_ARCH_NONE;
}
const frontend_ctx_driver_t frontend_ctx_apple = {
frontend_apple_get_environment_settings,
const frontend_ctx_driver_t frontend_ctx_darwin = {
frontend_darwin_get_environment_settings,
NULL, /* init */
NULL, /* deinit */
NULL, /* exitspawn */
@ -521,13 +521,13 @@ const frontend_ctx_driver_t frontend_ctx_apple = {
NULL, /* exec */
NULL, /* set_fork */
NULL, /* shutdown */
frontend_apple_get_name,
frontend_apple_get_os,
frontend_apple_get_rating,
frontend_apple_load_content,
frontend_apple_get_architecture,
frontend_apple_get_powerstate,
"apple",
frontend_darwin_get_name,
frontend_darwin_get_os,
frontend_darwin_get_rating,
frontend_darwin_load_content,
frontend_darwin_get_architecture,
frontend_darwin_get_powerstate,
"darwin",
};
#if !defined(HAVE_COCOA) && !defined(HAVE_COCOATOUCH)

4
frontend/frontend_driver.c
View File

@ -35,8 +35,8 @@ static const frontend_ctx_driver_t *frontend_ctx_drivers[] = {
#if defined(__QNX__)
&frontend_ctx_qnx,
#endif
#if defined(__APPLE__)
&frontend_ctx_apple,
#if defined(__APPLE__) && defined(__MACH__)
&frontend_ctx_darwin,
#endif
#if defined(ANDROID)
&frontend_ctx_android,

2
frontend/frontend_driver.h
View File

@ -79,7 +79,7 @@ extern const frontend_ctx_driver_t frontend_ctx_gx;
extern const frontend_ctx_driver_t frontend_ctx_ps3;
extern const frontend_ctx_driver_t frontend_ctx_xdk;
extern const frontend_ctx_driver_t frontend_ctx_qnx;
extern const frontend_ctx_driver_t frontend_ctx_apple;
extern const frontend_ctx_driver_t frontend_ctx_darwin;
extern const frontend_ctx_driver_t frontend_ctx_android;
extern const frontend_ctx_driver_t frontend_ctx_linux;
extern const frontend_ctx_driver_t frontend_ctx_psp;

4
griffin/griffin_objc.m
View File

@ -23,8 +23,8 @@
#define __IPHONE_OS_VERSION_MAX_ALLOWED 00000
#endif
#if defined(__APPLE__)
#include "../frontend/drivers/platform_apple.m"
#if defined(__APPLE__) && defined(__MACH__)
#include "../frontend/drivers/platform_darwin.m"
#endif
#if defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA)