diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-02-20 02:08:44 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-02-20 02:08:44 +0100 |
| commit | 6d8df311a32cd9841aa9fa81228f3ba5180d26be (patch) | |
| tree | cfa2e210a36bbe5063fdbc23e4cbbfd3d78b63a4 /Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | |
| parent | afba0d736d363fa4c71b86d84a1caad3d52f147e (diff) | |
| parent | 24ba058404d8036a977a41e55c58a7326302cb34 (diff) | |
Merge pull request #88 from lioncash/relative-includes
Relative includes
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index f1e2136ba9..7153a8d7f7 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -2,36 +2,35 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "ControllerInterface.h" +#include "Common/Thread.h" +#include "InputCommon/ControllerInterface/ControllerInterface.h" #if USE_EGL -#include "GLInterface/GLInterface.h" +#include "DolphinWX/GLInterface/GLInterface.h" #endif #ifdef CIFACE_USE_XINPUT - #include "XInput/XInput.h" + #include "InputCommon/ControllerInterface/XInput/XInput.h" #endif #ifdef CIFACE_USE_DINPUT - #include "DInput/DInput.h" + #include "InputCommon/ControllerInterface/DInput/DInput.h" #endif #ifdef CIFACE_USE_XLIB - #include "Xlib/Xlib.h" + #include "InputCommon/ControllerInterface/Xlib/Xlib.h" #ifdef CIFACE_USE_X11_XINPUT2 - #include "Xlib/XInput2.h" + #include "InputCommon/ControllerInterface/Xlib/XInput2.h" #endif #endif #ifdef CIFACE_USE_OSX - #include "OSX/OSX.h" + #include "InputCommon/ControllerInterface/OSX/OSX.h" #endif #ifdef CIFACE_USE_SDL - #include "SDL/SDL.h" + #include "InputCommon/ControllerInterface/SDL/SDL.h" #endif #ifdef CIFACE_USE_ANDROID - #include "Android/Android.h" + #include "InputCommon/ControllerInterface/Android/Android.h" #endif -#include "Thread.h" - using namespace ciface::ExpressionParser; namespace |