CCF_100/citra
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove dedicated_room dependence on core

Browse Source
This commit is contained in:
Vitor Kiguchi
2020-08-20 16:54:01 -03:00
parent fa0cb52a5d
commit 28188f13f5
15 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dedicated_room/CMakeLists.txt
View File

@@ -7,13 +7,13 @@ add_executable(citra-room
create_target_directory_groups(citra-room)
target_link_libraries(citra-room PRIVATE common core network)
target_link_libraries(citra-room PRIVATE common network)
if (ENABLE_WEB_SERVICE)
target_compile_definitions(citra-room PRIVATE -DENABLE_WEB_SERVICE)
target_link_libraries(citra-room PRIVATE web_service)
endif()
target_link_libraries(citra-room PRIVATE cryptopp glad)
target_link_libraries(citra-room PRIVATE cryptopp)
if (MSVC)
target_link_libraries(citra-room PRIVATE getopt)
endif()

4
src/dedicated_room/citra-room.cpp
View File

@@ -26,7 +26,7 @@
#include "common/logging/log.h"
#include "common/scm_rev.h"
#include "common/string_util.h"
#include "core/announce_multiplayer_session.h"
#include "network/announce_multiplayer_session.h"
#include "network/network.h"
#include "network/network_settings.h"
#include "network/room.h"
@@ -342,7 +342,7 @@ int main(int argc, char** argv) {
return -1;
}
std::cout << "Room is open. Close with Q+Enter...\n\n";
auto announce_session = std::make_unique<Core::AnnounceMultiplayerSession>();
auto announce_session = std::make_unique<Network::AnnounceMultiplayerSession>();
if (announce) {
announce_session->Start();
}