diff options
| author |  bunnei | 2021-04-20 10:19:03 -0700 |
|---|---|---|
| committer |  GitHub | 2021-04-20 10:19:03 -0700 |
| commit | 7083c5bfc8b6990ac9cd0758a452fbd75c15f3d2 (patch) | |
| tree | 0c80f17141b77304f932b7eaecd5834d22845700 /src/input_common/sdl/sdl_impl.cpp | |
| parent | Merge pull request #6217 from Morph1984/consistent-writebuffers (diff) | |
| parent | general: Ignore implicit-fallthrough for SDL.h (diff) | |
| download | yuzu-7083c5bfc8b6990ac9cd0758a452fbd75c15f3d2.tar.gz yuzu-7083c5bfc8b6990ac9cd0758a452fbd75c15f3d2.tar.xz yuzu-7083c5bfc8b6990ac9cd0758a452fbd75c15f3d2.zip | |
Merge pull request #6207 from lat9nq/sdl-2.0.14
cmake: Use SDL 2.0.14 and fix scope issue
Diffstat (limited to 'src/input_common/sdl/sdl_impl.cpp')
| -rw-r--r-- | src/input_common/sdl/sdl_impl.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
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" |