From d1bf7919daf830befd8c2166f3844fcdb56d68fa Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner
Date: Sat, 27 May 2017 16:10:25 -0700
Subject: 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.
---
 src/core/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/core/CMakeLists.txt')

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index b19335fe1..d9618c40c 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
-- 
cgit v1.2.3


From eb10f250254a0153abd789e49a36945d996631a7 Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner
Date: Sat, 27 May 2017 18:06:59 -0700
Subject: Move screen size constants from video_core to core

video_core didn't even properly use them, and they were the source of
many otherwise-unnecessary dependencies from core to video_core.
---
 src/core/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/core/CMakeLists.txt')

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index d9618c40c..cbfd1299c 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -179,6 +179,7 @@ set(SRCS
             )
 
 set(HEADERS
+            3ds.h
             arm/arm_interface.h
             arm/dynarmic/arm_dynarmic.h
             arm/dynarmic/arm_dynarmic_cp15.h
-- 
cgit v1.2.3


From 7b81903756451281bd1f07d8e9a2dceeff79df08 Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner
Date: Sat, 27 May 2017 18:26:55 -0700
Subject: CMake: Correct inter-module dependencies and library visibility

Modules didn't correctly define their dependencies before, which relied
on the frontends implicitly including every module for linking to
succeed.

Also changed every target_link_libraries call to specify visibility of
dependencies to avoid leaking definitions to dependents when not
necessary.
---
 src/core/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/core/CMakeLists.txt')

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index cbfd1299c..7aa81e885 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -380,5 +380,5 @@ include_directories(../../externals/cryptopp)
 create_directory_groups(${SRCS} ${HEADERS})
 
 add_library(core STATIC ${SRCS} ${HEADERS})
-
-target_link_libraries(core dynarmic cryptopp)
+target_link_libraries(core PUBLIC common PRIVATE audio_core video_core)
+target_link_libraries(core PRIVATE cryptopp dynarmic)
-- 
cgit v1.2.3