The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-13 00:58:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Android-trash' since it is no longer quite so trashy.

Browse Source
This commit is contained in:
Ryan Houdek
2013-04-14 23:36:00 -05:00
parent 8a9fcd3014 44bbb54a62
commit 7772f0d071
52 changed files with 4187 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
View File

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