diff options
Diffstat (limited to 'src/input_common')
| -rw-r--r-- | src/input_common/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/input_common/sdl/sdl_impl.cpp | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/input_common/CMakeLists.txt b/src/input_common/CMakeLists.txt index c3cfe7efc..de53e1fda 100644 --- a/src/input_common/CMakeLists.txt +++ b/src/input_common/CMakeLists.txt | |||
| @@ -62,7 +62,7 @@ else() | |||
| 62 | ) | 62 | ) |
| 63 | endif() | 63 | endif() |
| 64 | 64 | ||
| 65 | if(SDL2_FOUND) | 65 | if (ENABLE_SDL2) |
| 66 | target_sources(input_common PRIVATE | 66 | target_sources(input_common PRIVATE |
| 67 | sdl/sdl_impl.cpp | 67 | sdl/sdl_impl.cpp |
| 68 | sdl/sdl_impl.h | 68 | sdl/sdl_impl.h |
diff --git a/src/input_common/sdl/sdl_impl.cpp b/src/input_common/sdl/sdl_impl.cpp index 9418e78fa..f682a6db4 100644 --- a/src/input_common/sdl/sdl_impl.cpp +++ b/src/input_common/sdl/sdl_impl.cpp | |||
| @@ -17,7 +17,17 @@ | |||
| 17 | #include <unordered_map> | 17 | #include <unordered_map> |
| 18 | #include <utility> | 18 | #include <utility> |
| 19 | #include <vector> | 19 | #include <vector> |
| 20 | |||
| 21 | // Ignore -Wimplicit-fallthrough due to https://github.com/libsdl-org/SDL/issues/4307 | ||
| 22 | #ifdef __clang__ | ||
| 23 | #pragma clang diagnostic push | ||
| 24 | #pragma clang diagnostic ignored "-Wimplicit-fallthrough" | ||
| 25 | #endif | ||
| 20 | #include <SDL.h> | 26 | #include <SDL.h> |
| 27 | #ifdef __clang__ | ||
| 28 | #pragma clang diagnostic pop | ||
| 29 | #endif | ||
| 30 | |||
| 21 | #include "common/logging/log.h" | 31 | #include "common/logging/log.h" |
| 22 | #include "common/param_package.h" | 32 | #include "common/param_package.h" |
| 23 | #include "common/settings_input.h" | 33 | #include "common/settings_input.h" |