From d55a34b54b2ea758eba2a9e65ffc3ca3e2ef2d67 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 16 Nov 2015 01:08:01 +0100 Subject: [PATCH] Move cocoa_input.m to griffin_objc.m --- griffin/griffin_cpp.cpp | 6 ------ griffin/griffin_objc.m | 1 + 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp index e01aff5047..9237ec29d7 100644 --- a/griffin/griffin_cpp.cpp +++ b/griffin/griffin_cpp.cpp @@ -32,12 +32,6 @@ AUDIO #include "../audio/drivers/xaudio.cpp" #endif -/*============================================================ - INPUT - ============================================================ */ -#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) -#include "../input/drivers/cocoa_input.m" -#endif /*============================================================ KEYBOARD EVENT diff --git a/griffin/griffin_objc.m b/griffin/griffin_objc.m index fd666255fc..fe87fec2bd 100644 --- a/griffin/griffin_objc.m +++ b/griffin/griffin_objc.m @@ -28,6 +28,7 @@ #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"