Merge branch 'master' into wii-network

Conflicts:
	CMakeLists.txt
	Source/Core/Core/Core.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj.filters
	Source/Dolphin_2010.sln
	Source/VSProps/Dolphin.Win32.props
	Source/VSProps/Dolphin.x64.props

2 files changed, 8 insertions, 13 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
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.h b/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.h
index eb51a58779..8fe6dd1dee 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.h
@@ -1,7 +1,7 @@
 #ifndef _CIFACE_XINPUT_H_
 #define _CIFACE_XINPUT_H_
 
-#include "../ControllerInterface.h"
+#include "../Device.h"
 
 #define NOMINMAX
 #include <Windows.h>
@@ -12,12 +12,12 @@ namespace ciface
 namespace XInput
 {
 
-void Init(DeviceList& devices);
+void Init(std::vector<Core::Device*>& devices);
 
-class Device : public ControllerInterface::Device
+class Device : public Core::Device
 {
 private:
-	class Button : public Input
+	class Button : public Core::Device::Input
 	{
 	public:
 		std::string GetName() const;
@@ -28,7 +28,7 @@ private:
 		u8 m_index;
 	};
 
-	class Axis : public Input
+	class Axis : public Core::Device::Input
 	{
 	public:
 		std::string GetName() const;
@@ -40,7 +40,7 @@ private:
 		const u8 m_index;
 	};
 
-	class Trigger : public Input
+	class Trigger : public Core::Device::Input
 	{
 	public:
 		std::string GetName() const;
@@ -52,7 +52,7 @@ private:
 		const u8 m_index;
 	};
 
-	class Motor : public Output
+	class Motor : public Core::Device::Output
 	{
 	public:
 		std::string GetName() const;