diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-04-14 23:36:00 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-04-14 23:36:00 -0500 |
| commit | 7772f0d071cd8f1c6b44036207b4e6f9da4d9bf7 (patch) | |
| tree | 6dbe1cff255abe6e35f51910df73daf5eecbec88 /Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp | |
| parent | 8a9fcd3014a4aee23b6fb7008a02679f8bf96200 (diff) | |
| parent | 44bbb54a62a58be4ad39caf6ba55ff98244223d5 (diff) | |
Merge branch 'Android-trash' since it is no longer quite so trashy.
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp index 6a1427406d..6db79605a7 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp @@ -15,6 +15,9 @@ #ifdef CIFACE_USE_SDL #include "SDL/SDL.h" #endif +#ifdef CIFACE_USE_ANDROID + #include "Android/Android.h" +#endif #include "Thread.h" @@ -50,6 +53,9 @@ void ControllerInterface::Initialize() #ifdef CIFACE_USE_SDL ciface::SDL::Init(m_devices); #endif +#ifdef CIFACE_USE_ANDROID + ciface::Android::Init(m_devices); +#endif m_is_init = true; } @@ -100,6 +106,9 @@ void ControllerInterface::Shutdown() // TODO: there seems to be some sort of memory leak with SDL, quit isn't freeing everything up SDL_Quit(); #endif +#ifdef CIFACE_USE_ANDROID + // nothing needed +#endif m_is_init = false; } |