diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-05-27 16:10:25 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-05-27 16:10:25 -0700 |
| commit | d1bf7919daf830befd8c2166f3844fcdb56d68fa (patch) | |
| tree | 60ab4434e7a0503d7ca5f5d195d4709fe634f3c1 | |
| parent | ec8dfc8fb7218e5c552c42d30a68e13e350c3d0e (diff) | |
Move framebuffer_layout from Common to Core
This removes a dependency inversion between core and common. It's also
the proper place for the file since it makes screen layout decisions
specific to the 3DS.
| -rw-r--r-- | src/common/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/core/frontend/emu_window.h | 2 | ||||
| -rw-r--r-- | src/core/frontend/framebuffer_layout.cpp (renamed from src/common/framebuffer_layout.cpp) | 2 | ||||
| -rw-r--r-- | src/core/frontend/framebuffer_layout.h (renamed from src/common/framebuffer_layout.h) | 0 |
5 files changed, 4 insertions, 4 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 6905d2d506..546a145004 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -27,7 +27,6 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp.in" "${CMAKE_CURRENT_SOU set(SRCS break_points.cpp file_util.cpp - framebuffer_layout.cpp hash.cpp logging/filter.cpp logging/text_formatter.cpp @@ -56,7 +55,6 @@ set(HEADERS common_paths.h common_types.h file_util.h - framebuffer_layout.h hash.h linear_disk_cache.h logging/text_formatter.h diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index b19335fe1e..d9618c40c6 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -32,6 +32,7 @@ set(SRCS frontend/camera/factory.cpp frontend/camera/interface.cpp frontend/emu_window.cpp + frontend/framebuffer_layout.cpp frontend/motion_emu.cpp gdbstub/gdbstub.cpp hle/config_mem.cpp @@ -216,6 +217,7 @@ set(HEADERS frontend/camera/factory.h frontend/camera/interface.h frontend/emu_window.h + frontend/framebuffer_layout.h frontend/input.h frontend/motion_emu.h gdbstub/gdbstub.h diff --git a/src/core/frontend/emu_window.h b/src/core/frontend/emu_window.h index 36f2667fa4..9414123a46 100644 --- a/src/core/frontend/emu_window.h +++ b/src/core/frontend/emu_window.h @@ -8,8 +8,8 @@ #include <tuple> #include <utility> #include "common/common_types.h" -#include "common/framebuffer_layout.h" #include "common/math_util.h" +#include "core/frontend/framebuffer_layout.h" /** * Abstraction class used to provide an interface between emulation code and the frontend diff --git a/src/common/framebuffer_layout.cpp b/src/core/frontend/framebuffer_layout.cpp index a2a0e7dada..f3815170d5 100644 --- a/src/common/framebuffer_layout.cpp +++ b/src/core/frontend/framebuffer_layout.cpp @@ -5,7 +5,7 @@ #include <cmath> #include "common/assert.h" -#include "common/framebuffer_layout.h" +#include "core/frontend/framebuffer_layout.h" #include "core/settings.h" #include "video_core/video_core.h" diff --git a/src/common/framebuffer_layout.h b/src/core/frontend/framebuffer_layout.h index f1df5c55af..f1df5c55af 100644 --- a/src/common/framebuffer_layout.h +++ b/src/core/frontend/framebuffer_layout.h |