Move frontend-common to util/core

src/duckstation-nogui/CMakeLists.txt

@@ -4,7 +4,7 @@ add_executable(duckstation-nogui
   nogui_platform.h
 )
 
-target_link_libraries(duckstation-nogui PRIVATE core util common imgui glad frontend-common scmversion)
+target_link_libraries(duckstation-nogui PRIVATE core util common imgui glad scmversion)
 
 if(WIN32)
   message(STATUS "Building Win32 NoGUI Platform.")

src/duckstation-nogui/duckstation-nogui.vcxproj

@@ -48,9 +48,6 @@
     <ProjectReference Include="..\core\core.vcxproj">
       <Project>{868b98c8-65a1-494b-8346-250a73a48c0a}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\frontend-common\frontend-common.vcxproj">
-      <Project>{6245dec8-d2da-47ee-a373-cbd6fcf3ece6}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\util\util.vcxproj">
       <Project>{57f6206d-f264-4b07-baf8-11b9bbe1f455}</Project>
     </ProjectReference>
@@ -59,6 +56,6 @@
     <ProjectGuid>{0A172B2E-DC67-49FC-A4C1-975F93C586C4}</ProjectGuid>
   </PropertyGroup>
   <Import Project="..\..\dep\msvc\vsprops\Win32Application.props" />
-  <Import Project="..\frontend-common\frontend-common.props" />
+  <Import Project="..\core\core.props" />
   <Import Project="..\..\dep\msvc\vsprops\Targets.props" />
 </Project>

src/duckstation-nogui/nogui_host.cpp

@@ -2,6 +2,30 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #include "nogui_host.h"
+#include "nogui_platform.h"
+
+#include "scmversion/scmversion.h"
+
+#include "core/common_host.h"
+#include "core/controller.h"
+#include "core/fullscreen_ui.h"
+#include "core/game_list.h"
+#include "core/gpu.h"
+#include "core/host.h"
+#include "core/host_settings.h"
+#include "core/imgui_overlays.h"
+#include "core/settings.h"
+#include "core/system.h"
+
+#include "util/host_display.h"
+#include "util/imgui_manager.h"
+#include "util/ini_settings_interface.h"
+#include "util/input_manager.h"
+
+#include "imgui.h"
+#include "imgui_internal.h"
+#include "imgui_stdlib.h"
+
 #include "common/assert.h"
 #include "common/byte_stream.h"
 #include "common/crash_handler.h"
@@ -10,35 +34,17 @@
 #include "common/path.h"
 #include "common/string_util.h"
 #include "common/threading.h"
-#include "core/controller.h"
-#include "core/gpu.h"
-#include "core/host.h"
-#include "core/host_display.h"
-#include "core/host_settings.h"
-#include "core/settings.h"
-#include "core/system.h"
-#include "frontend-common/common_host.h"
-#include "frontend-common/fullscreen_ui.h"
-#include "frontend-common/game_list.h"
-#include "frontend-common/icon.h"
-#include "frontend-common/imgui_manager.h"
-#include "frontend-common/imgui_overlays.h"
-#include "frontend-common/input_manager.h"
-#include "imgui.h"
-#include "imgui_internal.h"
-#include "imgui_stdlib.h"
-#include "nogui_platform.h"
-#include "scmversion/scmversion.h"
-#include "util/ini_settings_interface.h"
+
 #include <cinttypes>
 #include <cmath>
 #include <condition_variable>
 #include <csignal>
 #include <thread>
+
 Log_SetChannel(NoGUIHost);
 
 #ifdef WITH_CHEEVOS
-#include "frontend-common/achievements.h"
+#include "core/achievements_private.h"
 #endif
 
 #ifdef _WIN32
@@ -731,6 +737,7 @@ void NoGUIHost::ReleaseHostDisplay()
   InputManager::CloseSources();
 
   CommonHost::ReleaseHostDisplayResources();
+  FullscreenUI::Shutdown();
   ImGuiManager::Shutdown();
   g_host_display.reset();
   g_nogui_window->ExecuteInMessageLoop([]() {

src/duckstation-nogui/nogui_platform.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #include "common/types.h"
-#include "core/host_display.h"
+#include "util/host_display.h"
 #include <functional>
 #include <memory>
 #include <optional>

src/duckstation-nogui/win32_nogui_platform.cpp

@@ -8,7 +8,7 @@
 #include "common/threading.h"
 #include "core/host.h"
 #include "core/host_settings.h"
-#include "frontend-common/imgui_manager.h"
+#include "util/imgui_manager.h"
 #include "nogui_host.h"
 #include "resource.h"
 #include "win32_key_names.h"