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/yuzu_cmd/emu_window/emu_window_sdl2.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/yuzu_cmd/emu_window/emu_window_sdl2.cpp')
| -rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp index ce8b7c218..3bb555a6b 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | |||
| @@ -2,7 +2,16 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | // Ignore -Wimplicit-fallthrough due to https://github.com/libsdl-org/SDL/issues/4307 | ||
| 6 | #ifdef __clang__ | ||
| 7 | #pragma clang diagnostic push | ||
| 8 | #pragma clang diagnostic ignored "-Wimplicit-fallthrough" | ||
| 9 | #endif | ||
| 5 | #include <SDL.h> | 10 | #include <SDL.h> |
| 11 | #ifdef __clang__ | ||
| 12 | #pragma clang diagnostic pop | ||
| 13 | #endif | ||
| 14 | |||
| 6 | #include "common/logging/log.h" | 15 | #include "common/logging/log.h" |
| 7 | #include "common/scm_rev.h" | 16 | #include "common/scm_rev.h" |
| 8 | #include "core/core.h" | 17 | #include "core/core.h" |