Use cmake to determine if we are enabling the Android Controller Interface

2016-02-05 10:54:17 -06:00 · 2016-02-05 10:54:17 -06:00 · 6305f09467
parent 018625e54f
commit 6305f09467
2 changed files with 1 additions and 3 deletions
--- 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()
--- 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