diff options
| author | 2016-12-23 13:37:40 +0000 | |
|---|---|---|
| committer | 2016-12-23 13:42:39 +0000 | |
| commit | 64f98f4d0f33b5c626d86a05ab9dd8060e160cc5 (patch) | |
| tree | 8874f16f9f840add798f58981d5c2fcdf4da3c84 /src/citra | |
| parent | Merge pull request #2364 from mailwl/nwm-services (diff) | |
| download | yuzu-64f98f4d0f33b5c626d86a05ab9dd8060e160cc5.tar.gz yuzu-64f98f4d0f33b5c626d86a05ab9dd8060e160cc5.tar.xz yuzu-64f98f4d0f33b5c626d86a05ab9dd8060e160cc5.zip | |
core: Move emu_window and key_map into core
* Removes circular dependences (common should not depend on core)
Diffstat (limited to 'src/citra')
| -rw-r--r-- | src/citra/emu_window/emu_window_sdl2.cpp | 2 | ||||
| -rw-r--r-- | src/citra/emu_window/emu_window_sdl2.h | 2 |
2 files changed, 2 insertions, 2 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" |
diff --git a/src/citra/emu_window/emu_window_sdl2.h b/src/citra/emu_window/emu_window_sdl2.h index e4d14ef12..c8cd919c6 100644 --- a/src/citra/emu_window/emu_window_sdl2.h +++ b/src/citra/emu_window/emu_window_sdl2.h | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <utility> | 7 | #include <utility> |
| 8 | #include "common/emu_window.h" | 8 | #include "core/frontend/emu_window.h" |
| 9 | 9 | ||
| 10 | struct SDL_Window; | 10 | struct SDL_Window; |
| 11 | 11 | ||