mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 08:37:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Apple) Cleanups

Browse Source
This commit is contained in:
Twinaphex 2015-04-12 16:55:50 +02:00
parent 68902c9d94
commit 0e2ed7c746
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apple/common/apple_cocoa_common.m
View File

@ -191,21 +191,12 @@ void apple_display_alert(const char *message, const char *title)
static RAGameView* g_instance; static RAGameView* g_instance;
#ifdef OSX #ifdef OSX
#include <OpenGL/CGLTypes.h>
#include <OpenGL/OpenGL.h>
void *nsview_get_ptr(void) void *nsview_get_ptr(void)
{ {
return g_instance; return g_instance;
} }
#endif #endif
#include "../../gfx/video_viewport.h"
#include "../../gfx/video_monitor.h"
#include "../../gfx/video_context_driver.h"
#include "../../gfx/drivers/gl_common.h"
#include "../../runloop.h"
/* forward declarations */ /* forward declarations */
void apple_gfx_ctx_update(void); void apple_gfx_ctx_update(void);
void *glkitview_init(void); void *glkitview_init(void);

17
gfx/drivers_context/apple_cocoa_gl.m
View File

@ -17,9 +17,13 @@
//#define HAVE_NSOPENGL //#define HAVE_NSOPENGL
#include <CoreGraphics/CGGeometry.h> #include <CoreGraphics/CGGeometry.h>
#ifdef OSX #if defined(OSX)
#include <OpenGL/CGLTypes.h>
#include <OpenGL/OpenGL.h>
#include <AppKit/NSScreen.h> #include <AppKit/NSScreen.h>
#include <AppKit/NSOpenGL.h> #include <AppKit/NSOpenGL.h>
#elif defined(IOS)
#include <GLKit/GLKit.h>
#endif #endif
#import "../../apple/common/RetroArch_Apple.h" #import "../../apple/common/RetroArch_Apple.h"
#include "../video_context_driver.h" #include "../video_context_driver.h"
@ -55,16 +59,7 @@
#define RAScreen NSScreen #define RAScreen NSScreen
#endif #endif
#if defined(OSX) #if defined(IOS)
/* RAGameView is a container on iOS;
* on OSX these are both the same object
*/
#define g_view g_instance
#elif defined(IOS)
#include <GLKit/GLKit.h>
#define ALMOST_INVISIBLE (.021f) #define ALMOST_INVISIBLE (.021f)
static GLKView *g_view; static GLKView *g_view;
static UIView *g_pause_indicator_view; static UIView *g_pause_indicator_view;