From 18ac296dac364f040f0002bd1d0d0120834c2213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= <Bruebach.Lukas@bdosecurity.de>
Date: Sun, 5 Oct 2025 00:08:42 +0200
Subject: [PATCH] Link tests against libs (yay!) and fix up includes that
 slipped through the crack.

Took 9 minutes
---
 cockatrice/src/game/abstract_game.h             | 2 +-
 cockatrice/src/game/player/menu/player_menu.cpp | 2 +-
 cockatrice/src/game/player/player_actions.cpp   | 4 ++--
 cockatrice/src/game/player/player_info.h        | 2 +-
 cockatrice/src/server/game_selector.h           | 4 ++--
 tests/CMakeLists.txt                            | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cockatrice/src/game/abstract_game.h b/cockatrice/src/game/abstract_game.h
index 08c25772c..6c1564dc1 100644
--- a/cockatrice/src/game/abstract_game.h
+++ b/cockatrice/src/game/abstract_game.h
@@ -7,7 +7,7 @@
 #ifndef COCKATRICE_ABSTRACT_GAME_H
 #define COCKATRICE_ABSTRACT_GAME_H
 
-#include "../../../common/pb/game_replay.pb.h"
+#include "pb/game_replay.pb.h"
 #include "game_event_handler.h"
 #include "game_meta_info.h"
 #include "game_state.h"
diff --git a/cockatrice/src/game/player/menu/player_menu.cpp b/cockatrice/src/game/player/menu/player_menu.cpp
index 873379683..e1bb7d8c6 100644
--- a/cockatrice/src/game/player/menu/player_menu.cpp
+++ b/cockatrice/src/game/player/menu/player_menu.cpp
@@ -1,6 +1,6 @@
 #include "player_menu.h"
 
-#include "../../../common/pb/command_reveal_cards.pb.h"
+#include "pb/command_reveal_cards.pb.h"
 #include "../../../tabs/tab_game.h"
 #include "../../board/card_item.h"
 #include "../../zones/hand_zone.h"
diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp
index ade75c124..f2ea57fca 100644
--- a/cockatrice/src/game/player/player_actions.cpp
+++ b/cockatrice/src/game/player/player_actions.cpp
@@ -1,7 +1,7 @@
 #include "player_actions.h"
 
-#include "../../../../libs/utility/include/utility/trice_limits.h"
-#include "../../../common/pb/context_move_card.pb.h"
+#include "utility/trice_limits.h"
+#include "pb/context_move_card.pb.h"
 #include "../../client/get_text_with_max.h"
 #include "../../tabs/tab_game.h"
 #include "../board/card_item.h"
diff --git a/cockatrice/src/game/player/player_info.h b/cockatrice/src/game/player/player_info.h
index e649b1584..ef7d52577 100644
--- a/cockatrice/src/game/player/player_info.h
+++ b/cockatrice/src/game/player/player_info.h
@@ -7,7 +7,7 @@
 #ifndef COCKATRICE_PLAYER_INFO_H
 #define COCKATRICE_PLAYER_INFO_H
 
-#include "../../../common/pb/serverinfo_user.pb.h"
+#include "pb/serverinfo_user.pb.h"
 #include "../../deck/deck_loader.h"
 #include "../zones/hand_zone.h"
 #include "../zones/pile_zone.h"
diff --git a/cockatrice/src/server/game_selector.h b/cockatrice/src/server/game_selector.h
index a6cadf141..b59bcb6b2 100644
--- a/cockatrice/src/server/game_selector.h
+++ b/cockatrice/src/server/game_selector.h
@@ -10,8 +10,8 @@
 #include "game_type_map.h"
 
 #include <QGroupBox>
-#include <common/pb/event_add_to_list.pb.h>
-#include <common/pb/event_remove_from_list.pb.h>
+#include <pb/event_add_to_list.pb.h>
+#include <pb/event_remove_from_list.pb.h>
 #include <pb/commands.pb.h>
 
 class QTreeView;
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f6b2d12d2..6f91c2965 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -45,9 +45,9 @@ endif()
 
 include_directories(${GTEST_INCLUDE_DIRS})
 target_link_libraries(dummy_test Threads::Threads ${GTEST_BOTH_LIBRARIES})
-target_link_libraries(expression_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
+target_link_libraries(expression_test utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
 target_link_libraries(test_age_formatting Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
-target_link_libraries(password_hash_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
+target_link_libraries(password_hash_test utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
 
 add_subdirectory(carddatabase)
 add_subdirectory(loading_from_clipboard)