summaryrefslogtreecommitdiff
path: root/src/core/hle
diff options
context:
space:
mode:
authorGravatar bunnei2016-12-23 17:35:35 -0500
committerGravatar GitHub2016-12-23 17:35:35 -0500
commit51dd13b8a00f833b5bde88569d5a814c35d13a21 (patch)
treea38fa78e0a70e730f53fae3696dad13d4f34ac26 /src/core/hle
parentMerge pull request #2370 from wwylele/where-is-my-shared-font (diff)
parentcore: Move emu_window and key_map into core (diff)
downloadyuzu-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/core/hle')
-rw-r--r--src/core/hle/service/hid/hid.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp
index 18a1b6a16..676154bd4 100644
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -3,9 +3,9 @@
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include <cmath> 5#include <cmath>
6#include "common/emu_window.h"
7#include "common/logging/log.h" 6#include "common/logging/log.h"
8#include "core/core_timing.h" 7#include "core/core_timing.h"
8#include "core/frontend/emu_window.h"
9#include "core/hle/kernel/event.h" 9#include "core/hle/kernel/event.h"
10#include "core/hle/kernel/shared_memory.h" 10#include "core/hle/kernel/shared_memory.h"
11#include "core/hle/service/hid/hid.h" 11#include "core/hle/service/hid/hid.h"