summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp
diff options
context:
space:
mode:
authorhrydgard <hrydgard@gmail.com>2010-06-03 18:05:08 +0000
committerhrydgard <hrydgard@gmail.com>2010-06-03 18:05:08 +0000
commita3c96ac42c4c2ce4a4cf2f5ca09a5ae9dd4bd303 (patch)
treeda7ca1f64fce704934d581c82a9533fe38b103f1 /Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp
parent3236aa9e73cf6d0bc798cce6f5224cff40eb6955 (diff)
Warp back to 5578. Sorry for the lost changes, please re-apply. Reason: 5579 is a complete disaster.
Not only does it change tons of files to switch to a new and non-working (it doesn't parse my ini files, at least) ini parser, it also reshuffles a lot of code and removes a plugin. The latter part is fine, but doing these two major switches in one revision, one of which is broken, is completely unacceptable. I said to merge tiny changes, not massive reworkings. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5589 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp')
-rw-r--r--Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp b/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp
index 61a7b724f6..a2b6c638c9 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp
@@ -4,8 +4,6 @@
#include "XInput.h"
-#pragma comment(lib, "xinput.lib")
-
namespace ciface
{
namespace XInput