From 6305f0946739c3aff01be642fe64d2aa8378487a Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Fri, 5 Feb 2016 10:54:17 -0600 Subject: [PATCH] Use cmake to determine if we are enabling the Android Controller Interface --- Source/Core/InputCommon/CMakeLists.txt | 1 + .../Core/InputCommon/ControllerInterface/ControllerInterface.h | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt index 01eef4532c..70e8304f37 100644 --- a/Source/Core/InputCommon/CMakeLists.txt +++ b/Source/Core/InputCommon/CMakeLists.txt @@ -31,6 +31,7 @@ elseif(X11_FOUND) endif() set(LIBS ${LIBS} ${X11_LIBRARIES} ${XINPUT2_LIBRARIES}) elseif(ANDROID) + add_definitions(-DCIFACE_USE_ANDROID) set(SRCS ${SRCS} ControllerInterface/Android/Android.cpp) endif() diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h index 08b282dba8..e324817dd3 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h @@ -29,9 +29,6 @@ #if defined(__APPLE__) #define CIFACE_USE_OSX #endif -#ifdef ANDROID - #define CIFACE_USE_ANDROID -#endif #if defined(HAVE_SDL) && HAVE_SDL #define CIFACE_USE_SDL #endif