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

Merge pull request #4102 from ligfx/quartz_input

Browse Source 
Add Quartz/CoreGraphics controller interface for default k&m events
This commit is contained in:
shuffle2
2016-10-03 03:13:58 -07:00
committed by GitHub
parent 5045fc869c 0f5951e324
commit 2747fd3a0d
7 changed files with 346 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
View File

@ -18,6 +18,7 @@
#endif
#ifdef CIFACE_USE_OSX
#include "InputCommon/ControllerInterface/OSX/OSX.h"
#include "InputCommon/ControllerInterface/Quartz/Quartz.h"
#endif
#ifdef CIFACE_USE_SDL
#include "InputCommon/ControllerInterface/SDL/SDL.h"
@ -64,6 +65,7 @@ void ControllerInterface::Initialize(void* const hwnd)
#endif
#ifdef CIFACE_USE_OSX
ciface::OSX::Init(hwnd);
ciface::Quartz::Init(hwnd);
#endif
#ifdef CIFACE_USE_SDL
ciface::SDL::Init();
@ -111,6 +113,7 @@ void ControllerInterface::Shutdown()
#endif
#ifdef CIFACE_USE_OSX
ciface::OSX::DeInit();
ciface::Quartz::DeInit();
#endif
#ifdef CIFACE_USE_SDL
// TODO: there seems to be some sort of memory leak with SDL, quit isn't freeing everything up