From 64f98f4d0f33b5c626d86a05ab9dd8060e160cc5 Mon Sep 17 00:00:00 2001
From: MerryMage <MerryMage@users.noreply.github.com>
Date: Fri, 23 Dec 2016 13:37:40 +0000
Subject: core: Move emu_window and key_map into core

* Removes circular dependences (common should not depend on core)
---
 src/citra/emu_window/emu_window_sdl2.cpp | 2 +-
 src/citra/emu_window/emu_window_sdl2.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/citra')

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;
 
-- 
cgit v1.2.3