diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/input_common/sdl/sdl.h | 7 | ||||
| -rw-r--r-- | src/input_common/sdl/sdl_impl.cpp | 2 | ||||
| -rw-r--r-- | src/input_common/sdl/sdl_impl.h | 7 |
3 files changed, 5 insertions, 11 deletions
diff --git a/src/input_common/sdl/sdl.h b/src/input_common/sdl/sdl.h index d7f24c68a..5306daa70 100644 --- a/src/input_common/sdl/sdl.h +++ b/src/input_common/sdl/sdl.h | |||
| @@ -6,15 +6,8 @@ | |||
| 6 | 6 | ||
| 7 | #include <memory> | 7 | #include <memory> |
| 8 | #include <vector> | 8 | #include <vector> |
| 9 | #include "core/frontend/input.h" | ||
| 10 | #include "input_common/main.h" | 9 | #include "input_common/main.h" |
| 11 | 10 | ||
| 12 | union SDL_Event; | ||
| 13 | |||
| 14 | namespace Common { | ||
| 15 | class ParamPackage; | ||
| 16 | } // namespace Common | ||
| 17 | |||
| 18 | namespace InputCommon::Polling { | 11 | namespace InputCommon::Polling { |
| 19 | class DevicePoller; | 12 | class DevicePoller; |
| 20 | enum class DeviceType; | 13 | enum class DeviceType; |
diff --git a/src/input_common/sdl/sdl_impl.cpp b/src/input_common/sdl/sdl_impl.cpp index 5b849283a..24252279d 100644 --- a/src/input_common/sdl/sdl_impl.cpp +++ b/src/input_common/sdl/sdl_impl.cpp | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #include <atomic> | 6 | #include <atomic> |
| 7 | #include <cmath> | 7 | #include <cmath> |
| 8 | #include <functional> | 8 | #include <functional> |
| 9 | #include <iterator> | ||
| 10 | #include <mutex> | 9 | #include <mutex> |
| 11 | #include <string> | 10 | #include <string> |
| 12 | #include <thread> | 11 | #include <thread> |
| @@ -15,7 +14,6 @@ | |||
| 15 | #include <utility> | 14 | #include <utility> |
| 16 | #include <vector> | 15 | #include <vector> |
| 17 | #include <SDL.h> | 16 | #include <SDL.h> |
| 18 | #include "common/assert.h" | ||
| 19 | #include "common/logging/log.h" | 17 | #include "common/logging/log.h" |
| 20 | #include "common/math_util.h" | 18 | #include "common/math_util.h" |
| 21 | #include "common/param_package.h" | 19 | #include "common/param_package.h" |
diff --git a/src/input_common/sdl/sdl_impl.h b/src/input_common/sdl/sdl_impl.h index 2579741d6..fadcf3139 100644 --- a/src/input_common/sdl/sdl_impl.h +++ b/src/input_common/sdl/sdl_impl.h | |||
| @@ -6,7 +6,10 @@ | |||
| 6 | 6 | ||
| 7 | #include <atomic> | 7 | #include <atomic> |
| 8 | #include <memory> | 8 | #include <memory> |
| 9 | #include <mutex> | ||
| 9 | #include <thread> | 10 | #include <thread> |
| 11 | #include <unordered_map> | ||
| 12 | #include "common/common_types.h" | ||
| 10 | #include "common/threadsafe_queue.h" | 13 | #include "common/threadsafe_queue.h" |
| 11 | #include "input_common/sdl/sdl.h" | 14 | #include "input_common/sdl/sdl.h" |
| 12 | 15 | ||
| @@ -16,9 +19,9 @@ using SDL_JoystickID = s32; | |||
| 16 | 19 | ||
| 17 | namespace InputCommon::SDL { | 20 | namespace InputCommon::SDL { |
| 18 | 21 | ||
| 19 | class SDLJoystick; | ||
| 20 | class SDLButtonFactory; | ||
| 21 | class SDLAnalogFactory; | 22 | class SDLAnalogFactory; |
| 23 | class SDLButtonFactory; | ||
| 24 | class SDLJoystick; | ||
| 22 | 25 | ||
| 23 | class SDLState : public State { | 26 | class SDLState : public State { |
| 24 | public: | 27 | public: |