summaryrefslogtreecommitdiffstats
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
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
-rw-r--r--src/citra/emu_window/emu_window_sdl2.cpp2
-rw-r--r--src/citra/emu_window/emu_window_sdl2.h2
-rw-r--r--src/citra_qt/bootmanager.cpp2
-rw-r--r--src/citra_qt/bootmanager.h2
-rw-r--r--src/common/CMakeLists.txt4
-rw-r--r--src/core/CMakeLists.txt4
-rw-r--r--src/core/frontend/emu_window.cpp (renamed from src/common/emu_window.cpp)4
-rw-r--r--src/core/frontend/emu_window.h (renamed from src/common/emu_window.h)0
-rw-r--r--src/core/frontend/key_map.cpp (renamed from src/common/key_map.cpp)4
-rw-r--r--src/core/frontend/key_map.h (renamed from src/common/key_map.h)0
-rw-r--r--src/core/hle/service/hid/hid.cpp2
-rw-r--r--src/core/settings.cpp2
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer_cache.cpp2
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.cpp2
14 files changed, 16 insertions, 16 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;
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index bb75633b6..57fde6caa 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -9,11 +9,11 @@
#endif
#include "citra_qt/bootmanager.h"
-#include "common/key_map.h"
#include "common/microprofile.h"
#include "common/scm_rev.h"
#include "common/string_util.h"
#include "core/core.h"
+#include "core/frontend/key_map.h"
#include "video_core/debug_utils/debug_utils.h"
#include "video_core/video_core.h"
diff --git a/src/citra_qt/bootmanager.h b/src/citra_qt/bootmanager.h
index af52f369b..43015390b 100644
--- a/src/citra_qt/bootmanager.h
+++ b/src/citra_qt/bootmanager.h
@@ -9,8 +9,8 @@
#include <mutex>
#include <QGLWidget>
#include <QThread>
-#include "common/emu_window.h"
#include "common/thread.h"
+#include "core/frontend/emu_window.h"
class QKeyEvent;
class QScreen;
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index e6c2ce335..5aecf6e6e 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -3,11 +3,9 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp.in" "${CMAKE_CURRENT_SOU
set(SRCS
break_points.cpp
- emu_window.cpp
file_util.cpp
framebuffer_layout.cpp
hash.cpp
- key_map.cpp
logging/filter.cpp
logging/text_formatter.cpp
logging/backend.cpp
@@ -34,11 +32,9 @@ set(HEADERS
common_funcs.h
common_paths.h
common_types.h
- emu_window.h
file_util.h
framebuffer_layout.h
hash.h
- key_map.h
linear_disk_cache.h
logging/text_formatter.h
logging/filter.h
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index ccbe7a9ce..3621449b3 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -29,6 +29,8 @@ set(SRCS
file_sys/ivfc_archive.cpp
file_sys/path_parser.cpp
file_sys/savedata_archive.cpp
+ frontend/emu_window.cpp
+ frontend/key_map.cpp
gdbstub/gdbstub.cpp
hle/config_mem.cpp
hle/applets/applet.cpp
@@ -198,6 +200,8 @@ set(HEADERS
file_sys/ivfc_archive.h
file_sys/path_parser.h
file_sys/savedata_archive.h
+ frontend/emu_window.h
+ frontend/key_map.h
gdbstub/gdbstub.h
hle/config_mem.h
hle/function_wrappers.h
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 @@
#include <algorithm>
#include <cmath>
#include "common/assert.h"
-#include "common/key_map.h"
-#include "emu_window.h"
+#include "core/frontend/emu_window.h"
+#include "core/frontend/key_map.h"
#include "video_core/video_core.h"
void EmuWindow::ButtonPressed(Service::HID::PadState pad) {
diff --git a/src/common/emu_window.h b/src/core/frontend/emu_window.h
index 835c4d500..835c4d500 100644
--- a/src/common/emu_window.h
+++ b/src/core/frontend/emu_window.h
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 @@
// Refer to the license.txt file included.
#include <map>
-#include "common/emu_window.h"
-#include "common/key_map.h"
+#include "core/frontend/emu_window.h"
+#include "core/frontend/key_map.h"
namespace KeyMap {
diff --git a/src/common/key_map.h b/src/core/frontend/key_map.h
index 040794578..040794578 100644
--- a/src/common/key_map.h
+++ b/src/core/frontend/key_map.h
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 @@
// Refer to the license.txt file included.
#include <cmath>
-#include "common/emu_window.h"
#include "common/logging/log.h"
#include "core/core_timing.h"
+#include "core/frontend/emu_window.h"
#include "core/hle/kernel/event.h"
#include "core/hle/kernel/shared_memory.h"
#include "core/hle/service/hid/hid.h"
diff --git a/src/core/settings.cpp b/src/core/settings.cpp
index 626e06cd9..5d23c52f9 100644
--- a/src/core/settings.cpp
+++ b/src/core/settings.cpp
@@ -7,7 +7,7 @@
#include "settings.h"
#include "video_core/video_core.h"
-#include "common/emu_window.h"
+#include "core/frontend/emu_window.h"
namespace Settings {
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
index 0b2e48407..85aa06cd5 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
@@ -11,11 +11,11 @@
#include <vector>
#include <glad/glad.h>
#include "common/bit_field.h"
-#include "common/emu_window.h"
#include "common/logging/log.h"
#include "common/math_util.h"
#include "common/microprofile.h"
#include "common/vector_math.h"
+#include "core/frontend/emu_window.h"
#include "core/memory.h"
#include "video_core/debug_utils/debug_utils.h"
#include "video_core/pica_state.h"
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
index 93f0ac105..2aa90e5c1 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp
@@ -9,10 +9,10 @@
#include <glad/glad.h>
#include "common/assert.h"
#include "common/bit_field.h"
-#include "common/emu_window.h"
#include "common/logging/log.h"
#include "common/profiler_reporting.h"
#include "common/synchronized_wrapper.h"
+#include "core/frontend/emu_window.h"
#include "core/hw/gpu.h"
#include "core/hw/hw.h"
#include "core/hw/lcd.h"