summaryrefslogtreecommitdiffstats
path: root/src/citra
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2016-12-23 23:35:35 +0100
committerGitHub <noreply@github.com>2016-12-23 23:35:35 +0100
commit51dd13b8a00f833b5bde88569d5a814c35d13a21 (patch)
treea38fa78e0a70e730f53fae3696dad13d4f34ac26 /src/citra
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
yuzu-51dd13b8a00f833b5bde88569d5a814c35d13a21.tar.gz
yuzu-51dd13b8a00f833b5bde88569d5a814c35d13a21.tar.bz2
yuzu-51dd13b8a00f833b5bde88569d5a814c35d13a21.tar.lz
yuzu-51dd13b8a00f833b5bde88569d5a814c35d13a21.tar.xz
yuzu-51dd13b8a00f833b5bde88569d5a814c35d13a21.tar.zst
yuzu-51dd13b8a00f833b5bde88569d5a814c35d13a21.zip
Diffstat (limited to 'src/citra')
-rw-r--r--src/citra/emu_window/emu_window_sdl2.cpp2
-rw-r--r--src/citra/emu_window/emu_window_sdl2.h2
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 @@
#include <SDL.h>
#include <glad/glad.h>
#include "citra/emu_window/emu_window_sdl2.h"
-#include "common/key_map.h"
#include "common/logging/log.h"
#include "common/scm_rev.h"
#include "common/string_util.h"
+#include "core/frontend/key_map.h"
#include "core/hle/service/hid/hid.h"
#include "core/settings.h"
#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 @@
#pragma once
#include <utility>
-#include "common/emu_window.h"
+#include "core/frontend/emu_window.h"
struct SDL_Window;