diff options
| author |  MerryMage | 2016-12-23 13:37:40 +0000 |
|---|---|---|
| committer | MerryMage | 2016-12-23 13:42:39 +0000 |
| commit | 64f98f4d0f33b5c626d86a05ab9dd8060e160cc5 (patch) | |
| tree | 8874f16f9f840add798f58981d5c2fcdf4da3c84 /src/common/key_map.cpp | |
| 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 '')
| -rw-r--r-- | src/core/frontend/key_map.cpp (renamed from src/common/key_map.cpp) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/key_map.cpp b/src/core/frontend/key_map.cpp index 97cafe9c9..15f0e079c 100644 --- a/src/common/key_map.cpp +++ b/src/core/frontend/key_map.cpp | |||
| @@ -3,8 +3,8 @@ | |||
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include <map> | 5 | #include <map> |
| 6 | #include "common/emu_window.h" | 6 | #include "core/frontend/emu_window.h" |
| 7 | #include "common/key_map.h" | 7 | #include "core/frontend/key_map.h" |
| 8 | 8 | ||
| 9 | namespace KeyMap { | 9 | namespace KeyMap { |
| 10 | 10 | ||