Turn into C for now

mme4crt · Nov 16, 2015 · f2f1db1 · f2f1db1
1 parent d55a34b
commit f2f1db1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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 → input/drivers/cocoa_input.c b/input/drivers/cocoa_input.m → input/drivers/cocoa_input.c