mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-11 02:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move SI_GCAdapter over to InputCommon

Browse source
This commit is contained in:
Ryan Houdek 2015-12-31 10:27:51 -06:00
commit 371e9f4fae
12 changed files with 27 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Source/Core/UICommon/UICommon.cpp
View file

@ -11,11 +11,10 @@
#include "Common/Logging/LogManager.h"
#include "Core/ConfigManager.h"
#if defined(__LIBUSB__) || defined (_WIN32)
#include "Core/HW/SI_GCAdapter.h"
#endif
#include "Core/HW/Wiimote.h"
#include "InputCommon/GCAdapter.h"
#include "UICommon/UICommon.h"
#include "VideoCommon/VideoBackendBase.h"
@ -30,7 +29,7 @@ void Init()
VideoBackend::PopulateList();
WiimoteReal::LoadSettings();
#if defined(__LIBUSB__) || defined (_WIN32)
SI_GCAdapter::Init();
GCAdapter::Init();
#endif
VideoBackend::ActivateBackend(SConfig::GetInstance().m_strVideoBackend);
@ -40,7 +39,7 @@ void Init()
void Shutdown()
{
#if defined(__LIBUSB__) || defined (_WIN32)
SI_GCAdapter::Shutdown();
GCAdapter::Shutdown();
#endif
WiimoteReal::Shutdown();
VideoBackend::ClearList();