From d2d240ecf5a877b6adc6f4be0dde23920e3c3b84 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Wed, 20 Nov 2019 02:58:17 +0100 Subject: [PATCH] (iOS) Should fix iOS build problems --- gfx/drivers_context/cocoa_gl_ctx.m | 4 ---- ui/drivers/cocoa/apple_platform.h | 2 ++ ui/drivers/cocoa/cocoa_common.m | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gfx/drivers_context/cocoa_gl_ctx.m b/gfx/drivers_context/cocoa_gl_ctx.m index 81039958a8..98601bd0f0 100644 --- a/gfx/drivers_context/cocoa_gl_ctx.m +++ b/gfx/drivers_context/cocoa_gl_ctx.m @@ -63,10 +63,6 @@ typedef struct cocoa_ctx_data static enum gfx_ctx_api cocoagl_api = GFX_CTX_NONE; -#if defined(HAVE_COCOATOUCH) -static GLKView *g_view; -#endif - static GLContextClass* g_hw_ctx; static GLContextClass* g_context; diff --git a/ui/drivers/cocoa/apple_platform.h b/ui/drivers/cocoa/apple_platform.h index e08339e933..d3cf4609cd 100644 --- a/ui/drivers/cocoa/apple_platform.h +++ b/ui/drivers/cocoa/apple_platform.h @@ -49,8 +49,10 @@ id apple_platform; } #endif +#if defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL) @property(nonatomic, retain) NSWindow IBOutlet *window; @end +#endif #endif diff --git a/ui/drivers/cocoa/cocoa_common.m b/ui/drivers/cocoa/cocoa_common.m index 7c968f087b..c63ea3f32e 100644 --- a/ui/drivers/cocoa/cocoa_common.m +++ b/ui/drivers/cocoa/cocoa_common.m @@ -53,6 +53,8 @@ static void *nsview_get_ptr(void) } #if defined(HAVE_COCOATOUCH) +static GLKView *g_view; + static void *glkitview_init(void) { g_view = [GLKView new];