diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-06-16 20:07:10 -0400 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-06-25 00:58:30 -0400 |
| commit | 877106b027431c6edb2d2c702fa6d811dac3d250 (patch) | |
| tree | a0d83be190efea7ad4915db7db9ac40f9192b251 /Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp | |
| parent | 143d2eccb49b700ccd00dfa229b03d1d1a51533c (diff) | |
InputCommon: Split Device stuff out
The ExpressionParser needs this to be out of here to prevent issues
with cyclic references.
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp b/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp index 3c7f3c48ae..c687bef856 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp @@ -1,6 +1,3 @@ -#include "../ControllerInterface.h" - -#ifdef CIFACE_USE_XINPUT #include "XInput.h" @@ -51,7 +48,7 @@ static const char* const named_motors[] = "Motor R" }; -void Init(DeviceList& devices) +void Init(std::vector<Core::Device*>& devices) { XINPUT_CAPABILITIES caps; for (int i = 0; i != 4; ++i) @@ -210,5 +207,3 @@ void Device::Motor::SetState(ControlState state) } } - -#endif |