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

Link tests against libs (yay!) and fix up includes that slipped through the crack.

Browse source 
Took 9 minutes
This commit is contained in:
Lukas Brübach 2025-10-05 00:08:42 +02:00
parent 60c6eb1110
commit 18ac296dac
6 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/game/abstract_game.h
View file

@ -7,7 +7,7 @@
#ifndef COCKATRICE_ABSTRACT_GAME_H #ifndef COCKATRICE_ABSTRACT_GAME_H
#define 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_event_handler.h"
#include "game_meta_info.h" #include "game_meta_info.h"
#include "game_state.h" #include "game_state.h"

2
cockatrice/src/game/player/menu/player_menu.cpp
View file

@ -1,6 +1,6 @@
#include "player_menu.h" #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 "../../../tabs/tab_game.h"
#include "../../board/card_item.h" #include "../../board/card_item.h"
#include "../../zones/hand_zone.h" #include "../../zones/hand_zone.h"

4
cockatrice/src/game/player/player_actions.cpp
View file

@ -1,7 +1,7 @@
#include "player_actions.h" #include "player_actions.h"
#include "../../../../libs/utility/include/utility/trice_limits.h" #include "utility/trice_limits.h"
#include "../../../common/pb/context_move_card.pb.h" #include "pb/context_move_card.pb.h"
#include "../../client/get_text_with_max.h" #include "../../client/get_text_with_max.h"
#include "../../tabs/tab_game.h" #include "../../tabs/tab_game.h"
#include "../board/card_item.h" #include "../board/card_item.h"

2
cockatrice/src/game/player/player_info.h
View file

@ -7,7 +7,7 @@
#ifndef COCKATRICE_PLAYER_INFO_H #ifndef COCKATRICE_PLAYER_INFO_H
#define 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 "../../deck/deck_loader.h"
#include "../zones/hand_zone.h" #include "../zones/hand_zone.h"
#include "../zones/pile_zone.h" #include "../zones/pile_zone.h"

4
cockatrice/src/server/game_selector.h
View file

@ -10,8 +10,8 @@
#include "game_type_map.h" #include "game_type_map.h"
#include <QGroupBox> #include <QGroupBox>
#include <common/pb/event_add_to_list.pb.h> #include <pb/event_add_to_list.pb.h>
#include <common/pb/event_remove_from_list.pb.h> #include <pb/event_remove_from_list.pb.h>
#include <pb/commands.pb.h> #include <pb/commands.pb.h>
class QTreeView; class QTreeView;

4
tests/CMakeLists.txt
View file

@ -45,9 +45,9 @@ endif()
include_directories(${GTEST_INCLUDE_DIRS}) include_directories(${GTEST_INCLUDE_DIRS})
target_link_libraries(dummy_test Threads::Threads ${GTEST_BOTH_LIBRARIES}) 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(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(carddatabase)
add_subdirectory(loading_from_clipboard) add_subdirectory(loading_from_clipboard)