diff --git a/gfx/drivers_context/cocoa_gl_ctx.m b/gfx/drivers_context/cocoa_gl_ctx.m index 8cb3eee4cb..30d6996daa 100644 --- a/gfx/drivers_context/cocoa_gl_ctx.m +++ b/gfx/drivers_context/cocoa_gl_ctx.m @@ -48,31 +48,7 @@ #include "../common/metal_common.h" #endif -#if defined(HAVE_COCOA_METAL) -id apple_platform; -@interface RetroArch_OSX : NSObject -{ - NSWindow* _window; - apple_view_type_t _vt; - NSView* _renderView; - id _sleepActivity; - WindowListener *_listener; -} -#elif defined(HAVE_COCOA) -id apple_platform; -#if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__))) -@interface RetroArch_OSX : NSObject -#else -@interface RetroArch_OSX : NSObject -#endif -{ - NSWindow* _window; -} -#endif - -@property (nonatomic, retain) NSWindow IBOutlet* window; - -@end +#include "../../ui/drivers/cocoa/apple_platform.h" typedef struct cocoa_ctx_data { diff --git a/ui/drivers/cocoa/apple_platform.h b/ui/drivers/cocoa/apple_platform.h new file mode 100644 index 0000000000..5509be27f3 --- /dev/null +++ b/ui/drivers/cocoa/apple_platform.h @@ -0,0 +1,30 @@ +#ifndef COCOA_APPLE_PLATFORM_H +#define COCOA_APPLE_PLATFORM_H + +#if defined(HAVE_COCOA_METAL) +id apple_platform; +@interface RetroArch_OSX : NSObject +{ + NSWindow* _window; + apple_view_type_t _vt; + NSView* _renderView; + id _sleepActivity; + WindowListener *_listener; +} +#elif defined(HAVE_COCOA) +id apple_platform; +#if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__))) +@interface RetroArch_OSX : NSObject +#else +@interface RetroArch_OSX : NSObject +#endif +{ + NSWindow* _window; +} +#endif + +@property (nonatomic, retain) NSWindow IBOutlet* window; + +@end + +#endif diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m index 8363d25c64..fc2d5247af 100644 --- a/ui/drivers/ui_cocoa.m +++ b/ui/drivers/ui_cocoa.m @@ -63,31 +63,7 @@ @end #endif -#if defined(HAVE_COCOA_METAL) -id apple_platform; -@interface RetroArch_OSX : NSObject -{ - NSWindow* _window; - apple_view_type_t _vt; - NSView* _renderView; - id _sleepActivity; - WindowListener *_listener; -} -#elif defined(HAVE_COCOA) -id apple_platform; -#if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__))) -@interface RetroArch_OSX : NSObject -#else -@interface RetroArch_OSX : NSObject -#endif -{ - NSWindow* _window; -} -#endif - -@property (nonatomic, retain) NSWindow IBOutlet* window; - -@end +#include "cocoa/apple_platform.h" static void app_terminate(void) {