summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2015-10-28 16:39:57 -0400
committerLioncash <mathew1800@gmail.com>2015-10-28 16:39:57 -0400
commite76b1f2d56a3f3632ad353e540e5234bdb28c293 (patch)
treebb30315bccaca030053f581881fc41bdcfb5d9cf /Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
parent09b27e854c6bd3ab4578e5b2b1c37c8d62141143 (diff)
parentd9d6cf8eda0d4cd8d0350c1a4e9b5f6b708e084d (diff)
Merge pull request #3170 from spxtr/pipes
Implemented GC Controller inputs via named pipes.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
index 0631069e16..93cd744003 100644
--- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
@@ -29,6 +29,9 @@
#ifdef CIFACE_USE_EVDEV
#include "InputCommon/ControllerInterface/evdev/evdev.h"
#endif
+#ifdef CIFACE_USE_PIPES
+ #include "InputCommon/ControllerInterface/Pipes/Pipes.h"
+#endif
using namespace ciface::ExpressionParser;
@@ -75,6 +78,9 @@ void ControllerInterface::Initialize(void* const hwnd)
#ifdef CIFACE_USE_EVDEV
ciface::evdev::Init(m_devices);
#endif
+#ifdef CIFACE_USE_PIPES
+ ciface::Pipes::Init(m_devices);
+#endif
m_is_init = true;
}