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/emu_window.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/emu_window.cpp (renamed from src/common/emu_window.cpp) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/emu_window.cpp b/src/core/frontend/emu_window.cpp index e3a9e08e6..f6f90f9e1 100644 --- a/src/common/emu_window.cpp +++ b/src/core/frontend/emu_window.cpp | |||
| @@ -5,8 +5,8 @@ | |||
| 5 | #include <algorithm> | 5 | #include <algorithm> |
| 6 | #include <cmath> | 6 | #include <cmath> |
| 7 | #include "common/assert.h" | 7 | #include "common/assert.h" |
| 8 | #include "common/key_map.h" | 8 | #include "core/frontend/emu_window.h" |
| 9 | #include "emu_window.h" | 9 | #include "core/frontend/key_map.h" |
| 10 | #include "video_core/video_core.h" | 10 | #include "video_core/video_core.h" |
| 11 | 11 | ||
| 12 | void EmuWindow::ButtonPressed(Service::HID::PadState pad) { | 12 | void EmuWindow::ButtonPressed(Service::HID::PadState pad) { |