diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/input_common/main.h | 10 | ||||
-rw-r--r-- | src/input_common/sdl/sdl_impl.cpp | 2 | ||||
-rw-r--r-- | src/input_common/settings.h | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/src/input_common/main.h b/src/input_common/main.h index ef52983e2..58e5dc250 100644 --- a/src/input_common/main.h +++ b/src/input_common/main.h @@ -8,13 +8,19 @@ #include <string> #include <unordered_map> #include <vector> -#include "input_common/gcadapter/gc_poller.h" -#include "input_common/settings.h" namespace Common { class ParamPackage; } +namespace Settings::NativeAnalog { +enum Values : int; +} + +namespace Settings::NativeButton { +enum Values : int; +} + namespace InputCommon { namespace Polling { diff --git a/src/input_common/sdl/sdl_impl.cpp b/src/input_common/sdl/sdl_impl.cpp index 7605c884d..c8d9eb2bc 100644 --- a/src/input_common/sdl/sdl_impl.cpp +++ b/src/input_common/sdl/sdl_impl.cpp @@ -17,11 +17,11 @@ #include <vector> #include <SDL.h> #include "common/logging/log.h" -#include "common/math_util.h" #include "common/param_package.h" #include "common/threadsafe_queue.h" #include "core/frontend/input.h" #include "input_common/sdl/sdl_impl.h" +#include "input_common/settings.h" namespace InputCommon::SDL { diff --git a/src/input_common/settings.h b/src/input_common/settings.h index 8e481a7fe..2d258960b 100644 --- a/src/input_common/settings.h +++ b/src/input_common/settings.h @@ -10,7 +10,7 @@ namespace Settings { namespace NativeButton { -enum Values { +enum Values : int { A, B, X, @@ -52,7 +52,7 @@ extern const std::array<const char*, NumButtons> mapping; } // namespace NativeButton namespace NativeAnalog { -enum Values { +enum Values : int { LStick, RStick, |