jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 22:42:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix an include and only link remote server to servatrice.

Browse source 
Took 16 minutes
This commit is contained in:
Lukas Brübach 2025-10-08 16:00:25 +02:00
parent efa66c5b27
commit 83e8cb2039
8 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
View file

@ -9,6 +9,7 @@
#include <QDebug> #include <QDebug>
#include <QtMath> #include <QtMath>
#include <google/protobuf/descriptor.h> #include <google/protobuf/descriptor.h>
#include <libcockatrice/protocol/debug_pb_message.h>
#include <libcockatrice/protocol/featureset.h> #include <libcockatrice/protocol/featureset.h>
#include <libcockatrice/protocol/get_pb_extension.h> #include <libcockatrice/protocol/get_pb_extension.h>
#include <libcockatrice/protocol/pb/commands.pb.h> #include <libcockatrice/protocol/pb/commands.pb.h>

4
servatrice/CMakeLists.txt
View file

@ -107,12 +107,12 @@ add_executable(servatrice MACOSX_BUNDLE ${servatrice_MOC_SRCS} ${servatrice_RESO
if(CMAKE_HOST_SYSTEM MATCHES "FreeBSD") if(CMAKE_HOST_SYSTEM MATCHES "FreeBSD")
target_link_libraries( target_link_libraries(
servatrice libcockatrice_deck_list libcockatrice_network Threads::Threads ${SERVATRICE_QT_MODULES} servatrice libcockatrice_deck_list libcockatrice_network_server_remote Threads::Threads ${SERVATRICE_QT_MODULES}
${LIBEXECINFO_LIBRARY} ${LIBEXECINFO_LIBRARY}
) )
else() else()
target_link_libraries( target_link_libraries(
servatrice libcockatrice_deck_list libcockatrice_network Threads::Threads ${SERVATRICE_QT_MODULES} servatrice libcockatrice_deck_list libcockatrice_network_server_remote Threads::Threads ${SERVATRICE_QT_MODULES}
) )
endif() endif()

4
servatrice/src/isl_interface.cpp
View file

@ -5,8 +5,8 @@
#include <QSslSocket> #include <QSslSocket>
#include <google/protobuf/descriptor.h> #include <google/protobuf/descriptor.h>
#include <libcockatrice/network/server/remote/server_protocolhandler.h> #include <server_protocolhandler.h>
#include <libcockatrice/network/server/remote/server_room.h> #include <server_room.h>
#include <libcockatrice/protocol/debug_pb_message.h> #include <libcockatrice/protocol/debug_pb_message.h>
#include <libcockatrice/protocol/get_pb_extension.h> #include <libcockatrice/protocol/get_pb_extension.h>
#include <libcockatrice/protocol/pb/event_game_joined.pb.h> #include <libcockatrice/protocol/pb/event_game_joined.pb.h>

2
servatrice/src/servatrice.cpp
View file

@ -40,7 +40,7 @@
#include <QUrl> #include <QUrl>
#include <iostream> #include <iostream>
#include <libcockatrice/deck_list/deck_list.h> #include <libcockatrice/deck_list/deck_list.h>
#include <libcockatrice/network/server/remote/server_room.h> #include <server_room.h>
#include <libcockatrice/protocol/featureset.h> #include <libcockatrice/protocol/featureset.h>
#include <libcockatrice/protocol/pb/event_connection_closed.pb.h> #include <libcockatrice/protocol/pb/event_connection_closed.pb.h>
#include <libcockatrice/protocol/pb/event_server_message.pb.h> #include <libcockatrice/protocol/pb/event_server_message.pb.h>

2
servatrice/src/servatrice.h
View file

@ -29,7 +29,7 @@
#include <QSslKey> #include <QSslKey>
#include <QTcpServer> #include <QTcpServer>
#include <QWebSocketServer> #include <QWebSocketServer>
#include <libcockatrice/network/server/remote/server.h> #include <server.h>
#include <utility> #include <utility>
Q_DECLARE_METATYPE(QSqlDatabase) Q_DECLARE_METATYPE(QSqlDatabase)

4
servatrice/src/servatrice_database_interface.h
View file

@ -5,8 +5,8 @@
#include <QHash> #include <QHash>
#include <QObject> #include <QObject>
#include <QSqlDatabase> #include <QSqlDatabase>
#include <libcockatrice/network/server/remote/server.h> #include <server.h>
#include <libcockatrice/network/server/remote/server_database_interface.h> #include <server_database_interface.h>
#define DATABASE_SCHEMA_VERSION 34 #define DATABASE_SCHEMA_VERSION 34

6
servatrice/src/serversocketinterface.cpp
View file

@ -37,9 +37,9 @@
#include <QString> #include <QString>
#include <iostream> #include <iostream>
#include <libcockatrice/deck_list/deck_list.h> #include <libcockatrice/deck_list/deck_list.h>
#include <libcockatrice/network/server/remote/game/server_player.h> #include <game/server_player.h>
#include <libcockatrice/network/server/remote/server_response_containers.h> #include <server_response_containers.h>
#include <libcockatrice/network/server/remote/server_room.h> #include <server_room.h>
#include <libcockatrice/protocol/pb/command_deck_del.pb.h> #include <libcockatrice/protocol/pb/command_deck_del.pb.h>
#include <libcockatrice/protocol/pb/command_deck_del_dir.pb.h> #include <libcockatrice/protocol/pb/command_deck_del_dir.pb.h>
#include <libcockatrice/protocol/pb/command_deck_download.pb.h> #include <libcockatrice/protocol/pb/command_deck_download.pb.h>

2
servatrice/src/serversocketinterface.h
View file

@ -24,7 +24,7 @@
#include <QMutex> #include <QMutex>
#include <QTcpSocket> #include <QTcpSocket>
#include <QWebSocket> #include <QWebSocket>
#include <libcockatrice/network/server/remote/server_protocolhandler.h> #include <server_protocolhandler.h>
class Servatrice; class Servatrice;
class Servatrice_DatabaseInterface; class Servatrice_DatabaseInterface;