From f2f1db12cfacf4d7a2786b5b949af033c5efad1d Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Mon, 16 Nov 2015 01:14:43 +0100 Subject: [PATCH] Turn into C for now --- griffin/griffin.c | 2 ++ griffin/griffin_objc.m | 1 - input/drivers/{cocoa_input.m => cocoa_input.c} | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename input/drivers/{cocoa_input.m => cocoa_input.c} (100%) diff --git a/griffin/griffin.c b/griffin/griffin.c index 180bbe2fc7..5de7e255a2 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -326,6 +326,8 @@ INPUT #include "../input/drivers/psp_input.c" #include "../input/drivers_joypad/psp_joypad.c" #include "../input/autoconf/builtin_psp.c" +#elif defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) +#include "../input/drivers/cocoa_input.c" #elif defined(_3DS) #include "../input/drivers/ctr_input.c" #include "../input/drivers_joypad/ctr_joypad.c" diff --git a/griffin/griffin_objc.m b/griffin/griffin_objc.m index fe87fec2bd..fd666255fc 100644 --- a/griffin/griffin_objc.m +++ b/griffin/griffin_objc.m @@ -28,7 +28,6 @@ #endif #if defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA) -#include "../input/drivers/cocoa_input.m" #include "../gfx/drivers_context/cocoa_gl_ctx.m" #include "../ui/drivers/cocoa/cocoa_common.m" diff --git a/input/drivers/cocoa_input.m b/input/drivers/cocoa_input.c similarity index 100% rename from input/drivers/cocoa_input.m rename to input/drivers/cocoa_input.c