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/citra_qt/bootmanager.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/citra_qt')

diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index bae576d6a..06b62f44c 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -12,12 +12,11 @@
 #include "common/microprofile.h"
 #include "common/scm_rev.h"
 #include "common/string_util.h"
+#include "core/3ds.h"
 #include "core/core.h"
 #include "core/settings.h"
 #include "input_common/keyboard.h"
 #include "input_common/main.h"
-#include "video_core/debug_utils/debug_utils.h"
-#include "video_core/video_core.h"
 
 EmuThread::EmuThread(GRenderWindow* render_window)
     : exec_step(false), running(false), stop_run(false), render_window(render_window) {}
@@ -266,8 +265,7 @@ void GRenderWindow::InitRenderTarget() {
     child = new GGLWidgetInternal(fmt, this);
     QBoxLayout* layout = new QHBoxLayout(this);
 
-    resize(VideoCore::kScreenTopWidth,
-           VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight);
+    resize(Core::kScreenTopWidth, Core::kScreenTopHeight + Core::kScreenBottomHeight);
     layout->addWidget(child);
     layout->setMargin(0);
     setLayout(layout);
-- 
cgit v1.2.3


From e91f2b7663e8be445761b21c26a3a861b6794b04 Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner
Date: Sat, 27 May 2017 18:07:53 -0700
Subject: Remove some unnecessary inclusions of video_core.h

---
 src/citra_qt/main.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/citra_qt')

diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index d7fad555f..eb2c7d613 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -43,7 +43,6 @@
 #include "core/gdbstub/gdbstub.h"
 #include "core/loader/loader.h"
 #include "core/settings.h"
-#include "video_core/video_core.h"
 
 #ifdef QT_STATICPLUGIN
 Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin);
-- 
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/citra_qt/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/citra_qt')

diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index 4e837668e..809e0b938 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -91,9 +91,9 @@ if (APPLE)
 else()
     add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS})
 endif()
-target_link_libraries(citra-qt core video_core audio_core common input_common)
-target_link_libraries(citra-qt ${OPENGL_gl_LIBRARY} ${CITRA_QT_LIBS})
-target_link_libraries(citra-qt ${PLATFORM_LIBRARIES} Threads::Threads)
+target_link_libraries(citra-qt PRIVATE audio_core common core input_common video_core)
+target_link_libraries(citra-qt PRIVATE ${OPENGL_gl_LIBRARY} ${CITRA_QT_LIBS} glad)
+target_link_libraries(citra-qt PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
 
 if(UNIX AND NOT APPLE)
     install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
-- 
cgit v1.2.3