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

Adjust servatrice.

Browse source 
Took 5 minutes


Took 2 minutes
This commit is contained in:
Lukas Brübach 2025-10-08 15:39:41 +02:00
parent 133c02f973
commit 59c83ff0e2
7 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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_server Threads::Threads ${SERVATRICE_QT_MODULES} servatrice libcockatrice_deck_list libcockatrice_network Threads::Threads ${SERVATRICE_QT_MODULES}
${LIBEXECINFO_LIBRARY} ${LIBEXECINFO_LIBRARY}
) )
else() else()
target_link_libraries( target_link_libraries(
servatrice libcockatrice_deck_list libcockatrice_server Threads::Threads ${SERVATRICE_QT_MODULES} servatrice libcockatrice_deck_list libcockatrice_network Threads::Threads ${SERVATRICE_QT_MODULES}
) )
endif() endif()

8
servatrice/src/isl_interface.cpp
View file

@ -3,10 +3,10 @@
#include "main.h" #include "main.h"
#include "server_logger.h" #include "server_logger.h"
#include <../../libcockatrice_network/libcockatrice/server/remote/server_protocolhandler.h> #include <libcockatrice/network/server/remote/server_protocolhandler.h>
#include <../../libcockatrice_network/libcockatrice/server/remote/server_room.h> #include <libcockatrice/network/server/remote/server_room.h>
#include <../../libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.h> #include <libcockatrice/protocol/debug_pb_message.h>
#include <../../libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.h> #include <libcockatrice/protocol/get_pb_extension.h>
#include <QSslSocket> #include <QSslSocket>
#include <google/protobuf/descriptor.h> #include <google/protobuf/descriptor.h>
#include <libcockatrice/protocol/pb/event_game_joined.pb.h> #include <libcockatrice/protocol/pb/event_game_joined.pb.h>

4
servatrice/src/servatrice.cpp
View file

@ -29,8 +29,6 @@
#include "settingscache.h" #include "settingscache.h"
#include "smtpclient.h" #include "smtpclient.h"
#include <../../libcockatrice_network/libcockatrice/server/remote/server_room.h>
#include <../../libcockatrice_protocol/libcockatrice/protocol/featureset.h>
#include <QDateTime> #include <QDateTime>
#include <QDebug> #include <QDebug>
#include <QFile> #include <QFile>
@ -42,6 +40,8 @@
#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 <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>
#include <libcockatrice/protocol/pb/event_server_shutdown.pb.h> #include <libcockatrice/protocol/pb/event_server_shutdown.pb.h>

2
servatrice/src/servatrice.h
View file

@ -20,7 +20,6 @@
#ifndef SERVATRICE_H #ifndef SERVATRICE_H
#define SERVATRICE_H #define SERVATRICE_H
#include <../../libcockatrice_network/libcockatrice/server/remote/server.h>
#include <QHostAddress> #include <QHostAddress>
#include <QMetaType> #include <QMetaType>
#include <QMutex> #include <QMutex>
@ -30,6 +29,7 @@
#include <QSslKey> #include <QSslKey>
#include <QTcpServer> #include <QTcpServer>
#include <QWebSocketServer> #include <QWebSocketServer>
#include <libcockatrice/network/server/remote/server.h>
#include <utility> #include <utility>
Q_DECLARE_METATYPE(QSqlDatabase) Q_DECLARE_METATYPE(QSqlDatabase)

4
servatrice/src/servatrice_database_interface.h
View file

@ -1,8 +1,8 @@
#ifndef SERVATRICE_DATABASE_INTERFACE_H #ifndef SERVATRICE_DATABASE_INTERFACE_H
#define SERVATRICE_DATABASE_INTERFACE_H #define SERVATRICE_DATABASE_INTERFACE_H
#include <../../libcockatrice_network/libcockatrice/server/remote/server.h> #include <libcockatrice/network/server/remote/server.h>
#include <../../libcockatrice_network/libcockatrice/server/remote/server_database_interface.h> #include <libcockatrice/network/server/remote/server_database_interface.h>
#include <QChar> #include <QChar>
#include <QHash> #include <QHash>
#include <QObject> #include <QObject>

6
servatrice/src/serversocketinterface.cpp
View file

@ -28,8 +28,6 @@
#include "settingscache.h" #include "settingscache.h"
#include "version_string.h" #include "version_string.h"
#include <../../libcockatrice_network/libcockatrice/server/remote/server_response_containers.h>
#include <../../libcockatrice_network/libcockatrice/server/remote/server_room.h>
#include <QDateTime> #include <QDateTime>
#include <QDebug> #include <QDebug>
#include <QHostAddress> #include <QHostAddress>
@ -39,6 +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 <libcockatrice/network/server/remote/server_response_containers.h>
#include <libcockatrice/network/server/remote/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>
@ -79,7 +80,6 @@
#include <libcockatrice/protocol/pb/serverinfo_deckstorage.pb.h> #include <libcockatrice/protocol/pb/serverinfo_deckstorage.pb.h>
#include <libcockatrice/protocol/pb/serverinfo_replay.pb.h> #include <libcockatrice/protocol/pb/serverinfo_replay.pb.h>
#include <libcockatrice/protocol/pb/serverinfo_user.pb.h> #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
#include <libcockatrice/server/game/server_player.h>
#include <libcockatrice/utility/trice_limits.h> #include <libcockatrice/utility/trice_limits.h>
#include <string> #include <string>

2
servatrice/src/serversocketinterface.h
View file

@ -20,7 +20,7 @@
#ifndef SERVERSOCKETINTERFACE_H #ifndef SERVERSOCKETINTERFACE_H
#define SERVERSOCKETINTERFACE_H #define SERVERSOCKETINTERFACE_H
#include <../../libcockatrice_network/libcockatrice/server/remote/server_protocolhandler.h> #include <libcockatrice/network/server/remote/server_protocolhandler.h>
#include <QHostAddress> #include <QHostAddress>
#include <QMutex> #include <QMutex>
#include <QTcpSocket> #include <QTcpSocket>