From a0d22d7c44b2258f918f3835be71d41783bb5fca Mon Sep 17 00:00:00 2001 From: meancoot Date: Sun, 7 Jul 2013 16:24:28 -0400 Subject: [PATCH] (Apple) Build fixes (hope I didn't break anything else with that merge) --- gfx/context/apple_gl_ctx.c | 2 +- gfx/gfx_context.c | 2 +- gfx/gfx_context.h | 2 +- griffin/griffin.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gfx/context/apple_gl_ctx.c b/gfx/context/apple_gl_ctx.c index 112f7ee329..d280bdf639 100644 --- a/gfx/context/apple_gl_ctx.c +++ b/gfx/context/apple_gl_ctx.c @@ -93,7 +93,7 @@ static void gfx_ctx_input_driver(const input_driver_t **input, void **input_data // The apple_* functions are implemented in apple/RetroArch/RAGameView.m -const gfx_ctx_driver_t gfx_ctx_ios = { +const gfx_ctx_driver_t gfx_ctx_apple = { apple_init_game_view, apple_destroy_game_view, gfx_ctx_bind_api, diff --git a/gfx/gfx_context.c b/gfx/gfx_context.c index 17c9ff488e..47745ca3f3 100644 --- a/gfx/gfx_context.c +++ b/gfx/gfx_context.c @@ -49,7 +49,7 @@ static const gfx_ctx_driver_t *gfx_ctx_drivers[] = { &gfx_ctx_bbqnx, #endif #if defined(IOS) || defined(OSX) //< Don't use __APPLE__ as it breaks basic SDL builds - &gfx_ctx_ios, + &gfx_ctx_apple, #endif #if defined(HAVE_SDL) && defined(HAVE_OPENGL) &gfx_ctx_sdl_gl, diff --git a/gfx/gfx_context.h b/gfx/gfx_context.h index 861479e564..fa70e76e73 100644 --- a/gfx/gfx_context.h +++ b/gfx/gfx_context.h @@ -107,7 +107,7 @@ extern const gfx_ctx_driver_t gfx_ctx_xdk; extern const gfx_ctx_driver_t gfx_ctx_wgl; extern const gfx_ctx_driver_t gfx_ctx_videocore; extern const gfx_ctx_driver_t gfx_ctx_bbqnx; -extern const gfx_ctx_driver_t gfx_ctx_ios; +extern const gfx_ctx_driver_t gfx_ctx_apple; extern const gfx_ctx_driver_t gfx_ctx_null; const gfx_ctx_driver_t *gfx_ctx_find_driver(const char *ident); // Finds driver with ident. Does not initialize. diff --git a/griffin/griffin.c b/griffin/griffin.c index e99daedbe2..3b3c6a80f0 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -107,8 +107,8 @@ VIDEO CONTEXT #include "../gfx/context/androidegl_ctx.c" #elif defined(__BLACKBERRY_QNX__) #include "../gfx/context/bbqnx_ctx.c" -#elif defined(IOS) -#include "../gfx/context/ioseagl_ctx.c" +#elif defined(IOS) || defined(OSX) +#include "../gfx/context/apple_gl_ctx.c" #endif #if defined(HAVE_OPENGL)