diff options
| author |  bunnei | 2016-12-23 17:35:35 -0500 |
|---|---|---|
| committer |  GitHub | 2016-12-23 17:35:35 -0500 |
| commit | 51dd13b8a00f833b5bde88569d5a814c35d13a21 (patch) | |
| tree | a38fa78e0a70e730f53fae3696dad13d4f34ac26 /src/citra/emu_window/emu_window_sdl2.cpp | |
| parent | Merge pull request #2370 from wwylele/where-is-my-shared-font (diff) | |
| parent | core: Move emu_window and key_map into core (diff) | |
| download | yuzu-51dd13b8a00f833b5bde88569d5a814c35d13a21.tar.gz yuzu-51dd13b8a00f833b5bde88569d5a814c35d13a21.tar.xz yuzu-51dd13b8a00f833b5bde88569d5a814c35d13a21.zip | |
Merge pull request #2369 from MerryMage/core-frontend
core: Move emu_window and key_map into core
Diffstat (limited to 'src/citra/emu_window/emu_window_sdl2.cpp')
| -rw-r--r-- | src/citra/emu_window/emu_window_sdl2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/citra/emu_window/emu_window_sdl2.cpp b/src/citra/emu_window/emu_window_sdl2.cpp index 8abe48984..b0d82b670 100644 --- a/src/citra/emu_window/emu_window_sdl2.cpp +++ b/src/citra/emu_window/emu_window_sdl2.cpp | |||
| @@ -9,10 +9,10 @@ | |||
| 9 | #include <SDL.h> | 9 | #include <SDL.h> |
| 10 | #include <glad/glad.h> | 10 | #include <glad/glad.h> |
| 11 | #include "citra/emu_window/emu_window_sdl2.h" | 11 | #include "citra/emu_window/emu_window_sdl2.h" |
| 12 | #include "common/key_map.h" | ||
| 13 | #include "common/logging/log.h" | 12 | #include "common/logging/log.h" |
| 14 | #include "common/scm_rev.h" | 13 | #include "common/scm_rev.h" |
| 15 | #include "common/string_util.h" | 14 | #include "common/string_util.h" |
| 15 | #include "core/frontend/key_map.h" | ||
| 16 | #include "core/hle/service/hid/hid.h" | 16 | #include "core/hle/service/hid/hid.h" |
| 17 | #include "core/settings.h" | 17 | #include "core/settings.h" |
| 18 | #include "video_core/video_core.h" | 18 | #include "video_core/video_core.h" |