From b904652d69fb3d3bf1918a7dd7f04bc049c9f460 Mon Sep 17 00:00:00 2001
From: FearlessTobi <thm.frey@gmail.com>
Date: Tue, 16 Aug 2022 23:13:05 +0200
Subject: [PATCH] yuzu_room: Remove dependency on core

---
 src/core/CMakeLists.txt                                | 2 --
 src/dedicated_room/CMakeLists.txt                      | 2 +-
 src/dedicated_room/yuzu_room.cpp                       | 2 +-
 src/network/CMakeLists.txt                             | 6 ++++++
 src/{core => network}/announce_multiplayer_session.cpp | 0
 src/{core => network}/announce_multiplayer_session.h   | 0
 src/yuzu/multiplayer/chat_room.cpp                     | 2 +-
 src/yuzu/multiplayer/client_room.cpp                   | 2 +-
 src/yuzu/multiplayer/host_room.cpp                     | 2 +-
 src/yuzu/multiplayer/lobby.h                           | 2 +-
 src/yuzu/multiplayer/state.h                           | 2 +-
 11 files changed, 13 insertions(+), 9 deletions(-)
 rename src/{core => network}/announce_multiplayer_session.cpp (100%)
 rename src/{core => network}/announce_multiplayer_session.h (100%)

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 8db9a3c654..25b39c52bd 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -2,8 +2,6 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 add_library(core STATIC
-    announce_multiplayer_session.cpp
-    announce_multiplayer_session.h
     arm/arm_interface.h
     arm/arm_interface.cpp
     arm/dynarmic/arm_dynarmic_32.cpp
diff --git a/src/dedicated_room/CMakeLists.txt b/src/dedicated_room/CMakeLists.txt
index b674b915b7..737aedbe47 100644
--- a/src/dedicated_room/CMakeLists.txt
+++ b/src/dedicated_room/CMakeLists.txt
@@ -10,7 +10,7 @@ add_executable(yuzu-room
 
 create_target_directory_groups(yuzu-room)
 
-target_link_libraries(yuzu-room PRIVATE common core network)
+target_link_libraries(yuzu-room PRIVATE common network)
 if (ENABLE_WEB_SERVICE)
     target_compile_definitions(yuzu-room PRIVATE -DENABLE_WEB_SERVICE)
     target_link_libraries(yuzu-room PRIVATE web_service)
diff --git a/src/dedicated_room/yuzu_room.cpp b/src/dedicated_room/yuzu_room.cpp
index 482e772fb3..7c1a75de3a 100644
--- a/src/dedicated_room/yuzu_room.cpp
+++ b/src/dedicated_room/yuzu_room.cpp
@@ -27,8 +27,8 @@
 #include "common/scm_rev.h"
 #include "common/settings.h"
 #include "common/string_util.h"
-#include "core/announce_multiplayer_session.h"
 #include "core/core.h"
+#include "network/announce_multiplayer_session.h"
 #include "network/network.h"
 #include "network/room.h"
 #include "network/verify_user.h"
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index 312f79b686..6f8ca4b90c 100644
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -2,6 +2,8 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 add_library(network STATIC
+    announce_multiplayer_session.cpp
+    announce_multiplayer_session.h
     network.cpp
     network.h
     packet.cpp
@@ -17,3 +19,7 @@ add_library(network STATIC
 create_target_directory_groups(network)
 
 target_link_libraries(network PRIVATE common enet Boost::boost)
+if (ENABLE_WEB_SERVICE)
+    target_compile_definitions(network PRIVATE -DENABLE_WEB_SERVICE)
+    target_link_libraries(network PRIVATE web_service)
+endif()
diff --git a/src/core/announce_multiplayer_session.cpp b/src/network/announce_multiplayer_session.cpp
similarity index 100%
rename from src/core/announce_multiplayer_session.cpp
rename to src/network/announce_multiplayer_session.cpp
diff --git a/src/core/announce_multiplayer_session.h b/src/network/announce_multiplayer_session.h
similarity index 100%
rename from src/core/announce_multiplayer_session.h
rename to src/network/announce_multiplayer_session.h
diff --git a/src/yuzu/multiplayer/chat_room.cpp b/src/yuzu/multiplayer/chat_room.cpp
index 1968a3c754..51ece1f212 100644
--- a/src/yuzu/multiplayer/chat_room.cpp
+++ b/src/yuzu/multiplayer/chat_room.cpp
@@ -16,7 +16,7 @@
 #include <QUrl>
 #include <QtConcurrent/QtConcurrentRun>
 #include "common/logging/log.h"
-#include "core/announce_multiplayer_session.h"
+#include "network/announce_multiplayer_session.h"
 #include "ui_chat_room.h"
 #include "yuzu/game_list_p.h"
 #include "yuzu/multiplayer/chat_room.h"
diff --git a/src/yuzu/multiplayer/client_room.cpp b/src/yuzu/multiplayer/client_room.cpp
index 86baafbf03..b34a8d004a 100644
--- a/src/yuzu/multiplayer/client_room.cpp
+++ b/src/yuzu/multiplayer/client_room.cpp
@@ -10,7 +10,7 @@
 #include <QTime>
 #include <QtConcurrent/QtConcurrentRun>
 #include "common/logging/log.h"
-#include "core/announce_multiplayer_session.h"
+#include "network/announce_multiplayer_session.h"
 #include "ui_client_room.h"
 #include "yuzu/game_list_p.h"
 #include "yuzu/multiplayer/client_room.h"
diff --git a/src/yuzu/multiplayer/host_room.cpp b/src/yuzu/multiplayer/host_room.cpp
index d70a9a3c86..8e7a812911 100644
--- a/src/yuzu/multiplayer/host_room.cpp
+++ b/src/yuzu/multiplayer/host_room.cpp
@@ -12,7 +12,7 @@
 #include <QtConcurrent/QtConcurrentRun>
 #include "common/logging/log.h"
 #include "common/settings.h"
-#include "core/announce_multiplayer_session.h"
+#include "network/announce_multiplayer_session.h"
 #include "ui_host_room.h"
 #include "yuzu/game_list_p.h"
 #include "yuzu/main.h"
diff --git a/src/yuzu/multiplayer/lobby.h b/src/yuzu/multiplayer/lobby.h
index 82744ca945..02cc766e45 100644
--- a/src/yuzu/multiplayer/lobby.h
+++ b/src/yuzu/multiplayer/lobby.h
@@ -9,7 +9,7 @@
 #include <QSortFilterProxyModel>
 #include <QStandardItemModel>
 #include "common/announce_multiplayer_room.h"
-#include "core/announce_multiplayer_session.h"
+#include "network/announce_multiplayer_session.h"
 #include "network/network.h"
 #include "yuzu/multiplayer/validation.h"
 
diff --git a/src/yuzu/multiplayer/state.h b/src/yuzu/multiplayer/state.h
index 9c60712d51..23960414e1 100644
--- a/src/yuzu/multiplayer/state.h
+++ b/src/yuzu/multiplayer/state.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <QWidget>
-#include "core/announce_multiplayer_session.h"
+#include "network/announce_multiplayer_session.h"
 #include "network/network.h"
 
 class QStandardItemModel;
-- 
GitLab