diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2016-10-03 03:13:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-03 03:13:58 -0700 |
| commit | 2747fd3a0d38821105ae124933070f9b83a41d15 (patch) | |
| tree | ff3b22a2ae13eba09836035bb865513bb0fc74ac /Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | |
| parent | 5045fc869cfbcbee8e7e069cf24cb23e2b3fef13 (diff) | |
| parent | 0f5951e324f2685e25f04c353d14b348fc6ba6f6 (diff) | |
Merge pull request #4102 from ligfx/quartz_input
Add Quartz/CoreGraphics controller interface for default k&m events
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index 9f35040539..c6f250a157 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -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 |