From d8100d299aeca3a9a2ef2a3e8c83062b29d48211 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Sun, 28 Sep 2014 07:01:39 +0200 Subject: [PATCH] (iOS) Build fixes --- apple/common/RAGameView.m | 1 + apple/common/apple_gfx_context.c.inl | 1 - input/apple_joypad.c | 4 ++++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apple/common/RAGameView.m b/apple/common/RAGameView.m index 4e1e1824b8..fc565d98e7 100644 --- a/apple/common/RAGameView.m +++ b/apple/common/RAGameView.m @@ -77,6 +77,7 @@ static UIView *g_pause_indicator_view; static RAGameView* g_instance; static GLContextClass* g_context; +static GLContextClass* g_hw_ctx; @implementation RAGameView diff --git a/apple/common/apple_gfx_context.c.inl b/apple/common/apple_gfx_context.c.inl index aae9088482..0f5160d824 100644 --- a/apple/common/apple_gfx_context.c.inl +++ b/apple/common/apple_gfx_context.c.inl @@ -9,7 +9,6 @@ static bool g_use_hw_ctx; #ifdef OSX static bool g_has_went_fullscreen; static NSOpenGLPixelFormat* g_format; -static NSOpenGLContext *g_hw_ctx; #endif static unsigned g_minor = 0; diff --git a/input/apple_joypad.c b/input/apple_joypad.c index c73dfda420..512196fedf 100644 --- a/input/apple_joypad.c +++ b/input/apple_joypad.c @@ -298,6 +298,7 @@ bool apple_joypad_has_interface(uint32_t slot) static int hid_init_manager(void) { +#ifdef OSX CFMutableArrayRef matcher; g_hid_manager = IOHIDManagerCreate( @@ -317,12 +318,14 @@ static int hid_init_manager(void) IOHIDManagerScheduleWithRunLoop(g_hid_manager, CFRunLoopGetMain(), kCFRunLoopCommonModes); IOHIDManagerOpen(g_hid_manager, kIOHIDOptionsTypeNone); +#endif return 0; } static int hid_exit(void) { +#ifdef OSX if (g_hid_manager) { IOHIDManagerClose(g_hid_manager, kIOHIDOptionsTypeNone); @@ -332,6 +335,7 @@ static int hid_exit(void) CFRelease(g_hid_manager); } g_hid_manager = NULL; +#endif return 0; }