diff options
| author | Michael Maltese <michael.joseph.maltese@gmail.com> | 2016-08-08 09:38:22 -0700 |
|---|---|---|
| committer | Michael Maltese <michael.joseph.maltese@gmail.com> | 2016-08-08 09:38:22 -0700 |
| commit | 3dc8136e1445244d8c7181d0bbb65e223728dd70 (patch) | |
| tree | dd63e024a5db39b2cfacc9d756f89099c3c153fb /Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | |
| parent | 1ab99ee22c1b6ae1b6d71aef717f277f39045067 (diff) | |
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 f1e62e73cf..78393f0861 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -21,6 +21,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" @@ -70,6 +71,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(); @@ -117,6 +119,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 |