From 83e8cb2039a651a53c74d0a77f953077b531c3b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= <Bruebach.Lukas@bdosecurity.de>
Date: Wed, 8 Oct 2025 16:00:25 +0200
Subject: [PATCH] Fix an include and only link remote server to servatrice.

Took 16 minutes
---
 .../network/server/remote/server_protocolhandler.cpp        | 1 +
 servatrice/CMakeLists.txt                                   | 4 ++--
 servatrice/src/isl_interface.cpp                            | 4 ++--
 servatrice/src/servatrice.cpp                               | 2 +-
 servatrice/src/servatrice.h                                 | 2 +-
 servatrice/src/servatrice_database_interface.h              | 4 ++--
 servatrice/src/serversocketinterface.cpp                    | 6 +++---
 servatrice/src/serversocketinterface.h                      | 2 +-
 8 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
index 4524b2aa2..92dcf4230 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
@@ -9,6 +9,7 @@
 #include <QDebug>
 #include <QtMath>
 #include <google/protobuf/descriptor.h>
+#include <libcockatrice/protocol/debug_pb_message.h>
 #include <libcockatrice/protocol/featureset.h>
 #include <libcockatrice/protocol/get_pb_extension.h>
 #include <libcockatrice/protocol/pb/commands.pb.h>
diff --git a/servatrice/CMakeLists.txt b/servatrice/CMakeLists.txt
index a17b517a0..e32ede90f 100644
--- a/servatrice/CMakeLists.txt
+++ b/servatrice/CMakeLists.txt
@@ -107,12 +107,12 @@ add_executable(servatrice MACOSX_BUNDLE ${servatrice_MOC_SRCS} ${servatrice_RESO
 
 if(CMAKE_HOST_SYSTEM MATCHES "FreeBSD")
   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}
   )
 else()
   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()
 
diff --git a/servatrice/src/isl_interface.cpp b/servatrice/src/isl_interface.cpp
index 4d1d872bf..034228046 100644
--- a/servatrice/src/isl_interface.cpp
+++ b/servatrice/src/isl_interface.cpp
@@ -5,8 +5,8 @@
 
 #include <QSslSocket>
 #include <google/protobuf/descriptor.h>
-#include <libcockatrice/network/server/remote/server_protocolhandler.h>
-#include <libcockatrice/network/server/remote/server_room.h>
+#include <server_protocolhandler.h>
+#include <server_room.h>
 #include <libcockatrice/protocol/debug_pb_message.h>
 #include <libcockatrice/protocol/get_pb_extension.h>
 #include <libcockatrice/protocol/pb/event_game_joined.pb.h>
diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp
index 3fea6b38d..e8a1a5041 100644
--- a/servatrice/src/servatrice.cpp
+++ b/servatrice/src/servatrice.cpp
@@ -40,7 +40,7 @@
 #include <QUrl>
 #include <iostream>
 #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/pb/event_connection_closed.pb.h>
 #include <libcockatrice/protocol/pb/event_server_message.pb.h>
diff --git a/servatrice/src/servatrice.h b/servatrice/src/servatrice.h
index 93e0ced7f..62fb382cb 100644
--- a/servatrice/src/servatrice.h
+++ b/servatrice/src/servatrice.h
@@ -29,7 +29,7 @@
 #include <QSslKey>
 #include <QTcpServer>
 #include <QWebSocketServer>
-#include <libcockatrice/network/server/remote/server.h>
+#include <server.h>
 #include <utility>
 
 Q_DECLARE_METATYPE(QSqlDatabase)
diff --git a/servatrice/src/servatrice_database_interface.h b/servatrice/src/servatrice_database_interface.h
index 6ed895795..be1d1ff19 100644
--- a/servatrice/src/servatrice_database_interface.h
+++ b/servatrice/src/servatrice_database_interface.h
@@ -5,8 +5,8 @@
 #include <QHash>
 #include <QObject>
 #include <QSqlDatabase>
-#include <libcockatrice/network/server/remote/server.h>
-#include <libcockatrice/network/server/remote/server_database_interface.h>
+#include <server.h>
+#include <server_database_interface.h>
 
 #define DATABASE_SCHEMA_VERSION 34
 
diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp
index e660c41d2..2703b70fd 100644
--- a/servatrice/src/serversocketinterface.cpp
+++ b/servatrice/src/serversocketinterface.cpp
@@ -37,9 +37,9 @@
 #include <QString>
 #include <iostream>
 #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 <game/server_player.h>
+#include <server_response_containers.h>
+#include <server_room.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_download.pb.h>
diff --git a/servatrice/src/serversocketinterface.h b/servatrice/src/serversocketinterface.h
index 10be93e2d..f24296c59 100644
--- a/servatrice/src/serversocketinterface.h
+++ b/servatrice/src/serversocketinterface.h
@@ -24,7 +24,7 @@
 #include <QMutex>
 #include <QTcpSocket>
 #include <QWebSocket>
-#include <libcockatrice/network/server/remote/server_protocolhandler.h>
+#include <server_protocolhandler.h>
 
 class Servatrice;
 class Servatrice_DatabaseInterface;