From 877106b027431c6edb2d2c702fa6d811dac3d250 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 16 Jun 2013 20:07:10 -0400 Subject: InputCommon: Split Device stuff out The ExpressionParser needs this to be out of here to prevent issues with cyclic references. --- Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp') 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& devices) { XINPUT_CAPABILITIES caps; for (int i = 0; i != 4; ++i) @@ -210,5 +207,3 @@ void Device::Motor::SetState(ControlState state) } } - -#endif -- cgit v1.2.3