diff options
| -rw-r--r-- | src/core/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/dedicated_room/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/dedicated_room/yuzu_room.cpp | 2 | ||||
| -rw-r--r-- | src/network/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/network/announce_multiplayer_session.cpp (renamed from src/core/announce_multiplayer_session.cpp) | 0 | ||||
| -rw-r--r-- | src/network/announce_multiplayer_session.h (renamed from src/core/announce_multiplayer_session.h) | 0 | ||||
| -rw-r--r-- | src/yuzu/multiplayer/chat_room.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/multiplayer/client_room.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/multiplayer/host_room.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/multiplayer/lobby.h | 2 | ||||
| -rw-r--r-- | src/yuzu/multiplayer/state.h | 2 |
11 files changed, 13 insertions, 9 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 8db9a3c65..25b39c52b 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt | |||
| @@ -2,8 +2,6 @@ | |||
| 2 | # SPDX-License-Identifier: GPL-2.0-or-later | 2 | # SPDX-License-Identifier: GPL-2.0-or-later |
| 3 | 3 | ||
| 4 | add_library(core STATIC | 4 | add_library(core STATIC |
| 5 | announce_multiplayer_session.cpp | ||
| 6 | announce_multiplayer_session.h | ||
| 7 | arm/arm_interface.h | 5 | arm/arm_interface.h |
| 8 | arm/arm_interface.cpp | 6 | arm/arm_interface.cpp |
| 9 | arm/dynarmic/arm_dynarmic_32.cpp | 7 | arm/dynarmic/arm_dynarmic_32.cpp |
diff --git a/src/dedicated_room/CMakeLists.txt b/src/dedicated_room/CMakeLists.txt index b674b915b..737aedbe4 100644 --- a/src/dedicated_room/CMakeLists.txt +++ b/src/dedicated_room/CMakeLists.txt | |||
| @@ -10,7 +10,7 @@ add_executable(yuzu-room | |||
| 10 | 10 | ||
| 11 | create_target_directory_groups(yuzu-room) | 11 | create_target_directory_groups(yuzu-room) |
| 12 | 12 | ||
| 13 | target_link_libraries(yuzu-room PRIVATE common core network) | 13 | target_link_libraries(yuzu-room PRIVATE common network) |
| 14 | if (ENABLE_WEB_SERVICE) | 14 | if (ENABLE_WEB_SERVICE) |
| 15 | target_compile_definitions(yuzu-room PRIVATE -DENABLE_WEB_SERVICE) | 15 | target_compile_definitions(yuzu-room PRIVATE -DENABLE_WEB_SERVICE) |
| 16 | target_link_libraries(yuzu-room PRIVATE web_service) | 16 | 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 482e772fb..7c1a75de3 100644 --- a/src/dedicated_room/yuzu_room.cpp +++ b/src/dedicated_room/yuzu_room.cpp | |||
| @@ -27,8 +27,8 @@ | |||
| 27 | #include "common/scm_rev.h" | 27 | #include "common/scm_rev.h" |
| 28 | #include "common/settings.h" | 28 | #include "common/settings.h" |
| 29 | #include "common/string_util.h" | 29 | #include "common/string_util.h" |
| 30 | #include "core/announce_multiplayer_session.h" | ||
| 31 | #include "core/core.h" | 30 | #include "core/core.h" |
| 31 | #include "network/announce_multiplayer_session.h" | ||
| 32 | #include "network/network.h" | 32 | #include "network/network.h" |
| 33 | #include "network/room.h" | 33 | #include "network/room.h" |
| 34 | #include "network/verify_user.h" | 34 | #include "network/verify_user.h" |
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 312f79b68..6f8ca4b90 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt | |||
| @@ -2,6 +2,8 @@ | |||
| 2 | # SPDX-License-Identifier: GPL-3.0-or-later | 2 | # SPDX-License-Identifier: GPL-3.0-or-later |
| 3 | 3 | ||
| 4 | add_library(network STATIC | 4 | add_library(network STATIC |
| 5 | announce_multiplayer_session.cpp | ||
| 6 | announce_multiplayer_session.h | ||
| 5 | network.cpp | 7 | network.cpp |
| 6 | network.h | 8 | network.h |
| 7 | packet.cpp | 9 | packet.cpp |
| @@ -17,3 +19,7 @@ add_library(network STATIC | |||
| 17 | create_target_directory_groups(network) | 19 | create_target_directory_groups(network) |
| 18 | 20 | ||
| 19 | target_link_libraries(network PRIVATE common enet Boost::boost) | 21 | target_link_libraries(network PRIVATE common enet Boost::boost) |
| 22 | if (ENABLE_WEB_SERVICE) | ||
| 23 | target_compile_definitions(network PRIVATE -DENABLE_WEB_SERVICE) | ||
| 24 | target_link_libraries(network PRIVATE web_service) | ||
| 25 | endif() | ||
diff --git a/src/core/announce_multiplayer_session.cpp b/src/network/announce_multiplayer_session.cpp index 6737ce85a..6737ce85a 100644 --- a/src/core/announce_multiplayer_session.cpp +++ b/src/network/announce_multiplayer_session.cpp | |||
diff --git a/src/core/announce_multiplayer_session.h b/src/network/announce_multiplayer_session.h index db790f7d2..db790f7d2 100644 --- a/src/core/announce_multiplayer_session.h +++ b/src/network/announce_multiplayer_session.h | |||
diff --git a/src/yuzu/multiplayer/chat_room.cpp b/src/yuzu/multiplayer/chat_room.cpp index 1968a3c75..51ece1f21 100644 --- a/src/yuzu/multiplayer/chat_room.cpp +++ b/src/yuzu/multiplayer/chat_room.cpp | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <QUrl> | 16 | #include <QUrl> |
| 17 | #include <QtConcurrent/QtConcurrentRun> | 17 | #include <QtConcurrent/QtConcurrentRun> |
| 18 | #include "common/logging/log.h" | 18 | #include "common/logging/log.h" |
| 19 | #include "core/announce_multiplayer_session.h" | 19 | #include "network/announce_multiplayer_session.h" |
| 20 | #include "ui_chat_room.h" | 20 | #include "ui_chat_room.h" |
| 21 | #include "yuzu/game_list_p.h" | 21 | #include "yuzu/game_list_p.h" |
| 22 | #include "yuzu/multiplayer/chat_room.h" | 22 | #include "yuzu/multiplayer/chat_room.h" |
diff --git a/src/yuzu/multiplayer/client_room.cpp b/src/yuzu/multiplayer/client_room.cpp index 86baafbf0..b34a8d004 100644 --- a/src/yuzu/multiplayer/client_room.cpp +++ b/src/yuzu/multiplayer/client_room.cpp | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | #include <QTime> | 10 | #include <QTime> |
| 11 | #include <QtConcurrent/QtConcurrentRun> | 11 | #include <QtConcurrent/QtConcurrentRun> |
| 12 | #include "common/logging/log.h" | 12 | #include "common/logging/log.h" |
| 13 | #include "core/announce_multiplayer_session.h" | 13 | #include "network/announce_multiplayer_session.h" |
| 14 | #include "ui_client_room.h" | 14 | #include "ui_client_room.h" |
| 15 | #include "yuzu/game_list_p.h" | 15 | #include "yuzu/game_list_p.h" |
| 16 | #include "yuzu/multiplayer/client_room.h" | 16 | #include "yuzu/multiplayer/client_room.h" |
diff --git a/src/yuzu/multiplayer/host_room.cpp b/src/yuzu/multiplayer/host_room.cpp index d70a9a3c8..8e7a81291 100644 --- a/src/yuzu/multiplayer/host_room.cpp +++ b/src/yuzu/multiplayer/host_room.cpp | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include <QtConcurrent/QtConcurrentRun> | 12 | #include <QtConcurrent/QtConcurrentRun> |
| 13 | #include "common/logging/log.h" | 13 | #include "common/logging/log.h" |
| 14 | #include "common/settings.h" | 14 | #include "common/settings.h" |
| 15 | #include "core/announce_multiplayer_session.h" | 15 | #include "network/announce_multiplayer_session.h" |
| 16 | #include "ui_host_room.h" | 16 | #include "ui_host_room.h" |
| 17 | #include "yuzu/game_list_p.h" | 17 | #include "yuzu/game_list_p.h" |
| 18 | #include "yuzu/main.h" | 18 | #include "yuzu/main.h" |
diff --git a/src/yuzu/multiplayer/lobby.h b/src/yuzu/multiplayer/lobby.h index 82744ca94..02cc766e4 100644 --- a/src/yuzu/multiplayer/lobby.h +++ b/src/yuzu/multiplayer/lobby.h | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | #include <QSortFilterProxyModel> | 9 | #include <QSortFilterProxyModel> |
| 10 | #include <QStandardItemModel> | 10 | #include <QStandardItemModel> |
| 11 | #include "common/announce_multiplayer_room.h" | 11 | #include "common/announce_multiplayer_room.h" |
| 12 | #include "core/announce_multiplayer_session.h" | 12 | #include "network/announce_multiplayer_session.h" |
| 13 | #include "network/network.h" | 13 | #include "network/network.h" |
| 14 | #include "yuzu/multiplayer/validation.h" | 14 | #include "yuzu/multiplayer/validation.h" |
| 15 | 15 | ||
diff --git a/src/yuzu/multiplayer/state.h b/src/yuzu/multiplayer/state.h index 9c60712d5..23960414e 100644 --- a/src/yuzu/multiplayer/state.h +++ b/src/yuzu/multiplayer/state.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | #pragma once | 4 | #pragma once |
| 5 | 5 | ||
| 6 | #include <QWidget> | 6 | #include <QWidget> |
| 7 | #include "core/announce_multiplayer_session.h" | 7 | #include "network/announce_multiplayer_session.h" |
| 8 | #include "network/network.h" | 8 | #include "network/network.h" |
| 9 | 9 | ||
| 10 | class QStandardItemModel; | 10 | class QStandardItemModel; |