VERY experimental Nintendo Switch 2 emulator
C++
yuzu_room: Remove dependency on core
FearlessTobi869724c3a525
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txtindex 8db9a3c654..25b39c52bd 100644--- a/src/core/CMakeLists.txt+++ b/src/core/CMakeLists.txt@@ -2,8 +2,6 @@# SPDX-License-Identifier: GPL-2.0-or-lateradd_library(core STATIC- announce_multiplayer_session.cpp- announce_multiplayer_session.harm/arm_interface.harm/arm_interface.cpparm/dynarmic/arm_dynarmic_32.cppdiff --git a/src/dedicated_room/CMakeLists.txt b/src/dedicated_room/CMakeLists.txtindex b674b915b7..737aedbe47 100644--- a/src/dedicated_room/CMakeLists.txt+++ b/src/dedicated_room/CMakeLists.txt@@ -10,7 +10,7 @@ add_executable(yuzu-roomcreate_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.cppindex 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.txtindex 312f79b686..6f8ca4b90c 100644--- a/src/network/CMakeLists.txt+++ b/src/network/CMakeLists.txt@@ -2,6 +2,8 @@# SPDX-License-Identifier: GPL-3.0-or-lateradd_library(network STATIC+ announce_multiplayer_session.cpp+ announce_multiplayer_session.hnetwork.cppnetwork.hpacket.cpp@@ -17,3 +19,7 @@ add_library(network STATICcreate_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.cppsimilarity index 100%rename from src/core/announce_multiplayer_session.cpprename to src/network/announce_multiplayer_session.cppdiff --git a/src/core/announce_multiplayer_session.h b/src/network/announce_multiplayer_session.hsimilarity index 100%rename from src/core/announce_multiplayer_session.hrename to src/network/announce_multiplayer_session.hdiff --git a/src/yuzu/multiplayer/chat_room.cpp b/src/yuzu/multiplayer/chat_room.cppindex 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.cppindex 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.cppindex 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.hindex 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.hindex 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;