Merge pull request #3595 from Sonicadvance1/Android_headless

[Android] Headless support
This commit is contained in:
Ryan Houdek
2016-02-06 20:08:58 -05:00
8 changed files with 179 additions and 159 deletions

View File

@ -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()

View File

@ -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