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/XInput | |
| parent | afba0d736d363fa4c71b86d84a1caad3d52f147e (diff) | |
| parent | 24ba058404d8036a977a41e55c58a7326302cb34 (diff) | |
Merge pull request #88 from lioncash/relative-includes
Relative includes
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/XInput')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/XInput/XInput.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp index a5b382e1ff..7574641258 100644 --- a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp +++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp @@ -1,5 +1,5 @@ -#include "XInput.h" +#include "InputCommon/ControllerInterface/XInput/XInput.h" namespace ciface { diff --git a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h index 39704821d7..f3dc398904 100644 --- a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h +++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h @@ -5,12 +5,12 @@ #pragma once -#include "../Device.h" - #define NOMINMAX -#include <Windows.h> +#include <windows.h> #include <XInput.h> +#include "InputCommon/ControllerInterface/Device.h" + #ifndef XINPUT_DEVSUBTYPE_FLIGHT_STICK #error You are building this module against the wrong version of DirectX. You probably need to remove DXSDK_DIR from your include path and/or _WIN32_WINNT is wrong. #endif |