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/SDL | |
| parent | afba0d736d363fa4c71b86d84a1caad3d52f147e (diff) | |
| parent | 24ba058404d8036a977a41e55c58a7326302cb34 (diff) | |
Merge pull request #88 from lioncash/relative-includes
Relative includes
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/SDL')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp | 8 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/SDL/SDL.h | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp index 074308305c..64c012c1c1 100644 --- a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp +++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp @@ -2,12 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "SDL.h" -#include <StringUtil.h> - +#include <algorithm> #include <map> #include <sstream> -#include <algorithm> + +#include "Common/StringUtil.h" +#include "InputCommon/ControllerInterface/SDL/SDL.h" #ifdef _WIN32 #pragma comment(lib, "SDL2.lib") diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h index f9ed688932..15f39998b9 100644 --- a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h +++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h @@ -4,12 +4,13 @@ #pragma once -#include "../Device.h" - #include <list> #include <SDL.h> +#include "InputCommon/ControllerInterface/Device.h" + + #if SDL_VERSION_ATLEAST(1, 3, 0) #define USE_SDL_HAPTIC #endif |