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 1

Fix pbs and some other stuff.

Browse source 
Took 1 hour 5 minutes
This commit is contained in:
Lukas Brübach 2025-10-04 20:06:57 +02:00
parent 01378b8314
commit 408b732854
84 changed files with 181 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/CMakeLists.txt
View file

@ -270,7 +270,9 @@ set(cockatrice_SOURCES
src/interface/utility/sequence_edit.cpp src/interface/utility/sequence_edit.cpp
) )
add_subdirectory(${CMAKE_SOURCE_DIR}/libs/deck_list ${CMAKE_BINARY_DIR}/libs/deck_list)
add_subdirectory(${CMAKE_SOURCE_DIR}/libs/pb ${CMAKE_BINARY_DIR}/libs/pb) add_subdirectory(${CMAKE_SOURCE_DIR}/libs/pb ${CMAKE_BINARY_DIR}/libs/pb)
add_subdirectory(${CMAKE_SOURCE_DIR}/libs/rng ${CMAKE_BINARY_DIR}/libs/rng)
add_subdirectory(${CMAKE_SOURCE_DIR}/libs/server ${CMAKE_BINARY_DIR}/libs/server) add_subdirectory(${CMAKE_SOURCE_DIR}/libs/server ${CMAKE_BINARY_DIR}/libs/server)
add_subdirectory(${CMAKE_SOURCE_DIR}/libs/settings ${CMAKE_BINARY_DIR}/libs/settings) add_subdirectory(${CMAKE_SOURCE_DIR}/libs/settings ${CMAKE_BINARY_DIR}/libs/settings)
add_subdirectory(${CMAKE_SOURCE_DIR}/libs/card ${CMAKE_BINARY_DIR}/libs/card) add_subdirectory(${CMAKE_SOURCE_DIR}/libs/card ${CMAKE_BINARY_DIR}/libs/card)
@ -367,9 +369,9 @@ elseif(Qt5_FOUND)
endif() endif()
if(Qt5_FOUND) if(Qt5_FOUND)
target_link_libraries(cockatrice cardlib utility serverlib cockatrice_common ${COCKATRICE_QT_MODULES}) target_link_libraries(cockatrice cardlib cockatrice_deck_list utility serverlib cockatrice_rng cockatrice_common ${COCKATRICE_QT_MODULES})
else() else()
target_link_libraries(cockatrice PUBLIC cardlib utility serverlib cockatrice_common ${COCKATRICE_QT_MODULES}) target_link_libraries(cockatrice PUBLIC cardlib cockatrice_deck_list utility serverlib cockatrice_rng cockatrice_common ${COCKATRICE_QT_MODULES})
endif() endif()
if(UNIX) if(UNIX)

4
cockatrice/src/client/tapped_out_interface.cpp
View file

@ -1,7 +1,7 @@
#include "tapped_out_interface.h" #include "tapped_out_interface.h"
#include "../../../libs/deck/deck_list.h" #include "deck_list/deck_list.h"
#include "../../../libs/deck/deck_list_card_node.h" #include "deck_list/deck_list_card_node.h"
#include <QDesktopServices> #include <QDesktopServices>
#include <QMessageBox> #include <QMessageBox>

2
cockatrice/src/client/tapped_out_interface.h
View file

@ -7,8 +7,8 @@
#ifndef TAPPEDOUT_INTERFACE_H #ifndef TAPPEDOUT_INTERFACE_H
#define TAPPEDOUT_INTERFACE_H #define TAPPEDOUT_INTERFACE_H
#include "../../../libs/deck/deck_list.h"
#include "card/card_database/card_database.h" #include "card/card_database/card_database.h"
#include "deck_list/deck_list.h"
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QObject> #include <QObject>

6
cockatrice/src/deck/deck_list_model.h
View file

@ -1,10 +1,10 @@
#ifndef DECKLISTMODEL_H #ifndef DECKLISTMODEL_H
#define DECKLISTMODEL_H #define DECKLISTMODEL_H
#include "../../../libs/deck/abstract_deck_list_card_node.h"
#include "../../../libs/deck/deck_list.h"
#include "../../../libs/deck/deck_list_card_node.h"
#include "card/card_printing/exact_card.h" #include "card/card_printing/exact_card.h"
#include "deck_list/abstract_deck_list_card_node.h"
#include "deck_list/deck_list.h"
#include "deck_list/deck_list_card_node.h"
#include <QAbstractItemModel> #include <QAbstractItemModel>
#include <QList> #include <QList>

4
cockatrice/src/deck/deck_loader.cpp
View file

@ -1,10 +1,10 @@
#include "deck_loader.h" #include "deck_loader.h"
#include "../../../libs/deck/deck_list.h"
#include "../../../libs/deck/deck_list_card_node.h"
#include "../main.h" #include "../main.h"
#include "card/card_database/card_database.h" #include "card/card_database/card_database.h"
#include "card/card_database/card_database_manager.h" #include "card/card_database/card_database_manager.h"
#include "deck_list/deck_list.h"
#include "deck_list/deck_list_card_node.h"
#include <QApplication> #include <QApplication>
#include <QClipboard> #include <QClipboard>

2
cockatrice/src/deck/deck_loader.h
View file

@ -7,7 +7,7 @@
#ifndef DECK_LOADER_H #ifndef DECK_LOADER_H
#define DECK_LOADER_H #define DECK_LOADER_H
#include "../../../libs/deck/deck_list.h" #include "deck_list/deck_list.h"
#include <QLoggingCategory> #include <QLoggingCategory>

4
cockatrice/src/deck/deck_stats_interface.cpp
View file

@ -1,7 +1,7 @@
#include "deck_stats_interface.h" #include "deck_stats_interface.h"
#include "../../../libs/deck/deck_list.h" #include "deck_list/deck_list.h"
#include "../../../libs/deck/deck_list_card_node.h" #include "deck_list/deck_list_card_node.h"
#include <QDesktopServices> #include <QDesktopServices>
#include <QMessageBox> #include <QMessageBox>

2
cockatrice/src/deck/deck_stats_interface.h
View file

@ -7,8 +7,8 @@
#ifndef DECKSTATS_INTERFACE_H #ifndef DECKSTATS_INTERFACE_H
#define DECKSTATS_INTERFACE_H #define DECKSTATS_INTERFACE_H
#include "../../../libs/deck/deck_list.h"
#include "card/card_database/card_database.h" #include "card/card_database/card_database.h"
#include "deck_list/deck_list.h"
#include <QObject> #include <QObject>

2
cockatrice/src/game/board/arrow_item.cpp
View file

@ -6,11 +6,11 @@
#include "../zones/card_zone.h" #include "../zones/card_zone.h"
#include "card/card_info.h" #include "card/card_info.h"
#include "card_item.h" #include "card_item.h"
#include "color.h"
#include "pb/command_attach_card.pb.h" #include "pb/command_attach_card.pb.h"
#include "pb/command_create_arrow.pb.h" #include "pb/command_create_arrow.pb.h"
#include "pb/command_delete_arrow.pb.h" #include "pb/command_delete_arrow.pb.h"
#include "settings/cache_settings.h" #include "settings/cache_settings.h"
#include "utility/color.h"
#include <QDebug> #include <QDebug>
#include <QGraphicsScene> #include <QGraphicsScene>

4
cockatrice/src/game/deckview/deck_view.cpp
View file

@ -1,9 +1,9 @@
#include "deck_view.h" #include "deck_view.h"
#include "../../../../libs/deck/deck_list.h"
#include "../../../../libs/deck/deck_list_card_node.h"
#include "../../interface/theme_manager.h" #include "../../interface/theme_manager.h"
#include "card/card_info.h" #include "card/card_info.h"
#include "deck_list/deck_list.h"
#include "deck_list/deck_list_card_node.h"
#include "settings/cache_settings.h" #include "settings/cache_settings.h"
#include <QApplication> #include <QApplication>

4
cockatrice/src/game/dialogs/dlg_create_token.cpp
View file

@ -1,13 +1,13 @@
#include "dlg_create_token.h" #include "dlg_create_token.h"
#include "../../../../libs/deck/deck_list.h"
#include "../../../../libs/utility/include/utility/trice_limits.h"
#include "../../interface/widgets/cards/card_info_picture_widget.h" #include "../../interface/widgets/cards/card_info_picture_widget.h"
#include "../../main.h" #include "../../main.h"
#include "card/card_database/card_database_manager.h" #include "card/card_database/card_database_manager.h"
#include "card/card_database/model/card_database_model.h" #include "card/card_database/model/card_database_model.h"
#include "card/card_database/model/token/token_display_model.h" #include "card/card_database/model/token/token_display_model.h"
#include "deck_list/deck_list.h"
#include "settings/cache_settings.h" #include "settings/cache_settings.h"
#include "utility/trice_limits.h"
#include <QCheckBox> #include <QCheckBox>
#include <QCloseEvent> #include <QCloseEvent>

2
cockatrice/src/game/game_event_handler.cpp
View file

@ -1,6 +1,6 @@
#include "game_event_handler.h" #include "game_event_handler.h"
#include "../../../libs/server/get_pb_extension.h" #include "../../../libs/server/include/server/get_pb_extension.h"
#include "../server/abstract_client.h" #include "../server/abstract_client.h"
#include "../server/pending_command.h" #include "../server/pending_command.h"
#include "../tabs/tab_game.h" #include "../tabs/tab_game.h"

2
cockatrice/src/game/log/message_log_widget.h
View file

@ -7,7 +7,7 @@
#ifndef MESSAGELOGWIDGET_H #ifndef MESSAGELOGWIDGET_H
#define MESSAGELOGWIDGET_H #define MESSAGELOGWIDGET_H
#include "../../../../libs/server/include/user_level.h" #include "../../../../libs/server/include/server/user_level.h"
#include "../../client/translation.h" #include "../../client/translation.h"
#include "../../server/chat_view/chat_view.h" #include "../../server/chat_view/chat_view.h"
#include "../zones/logic/card_zone_logic.h" #include "../zones/logic/card_zone_logic.h"

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

@ -12,7 +12,6 @@
#include "../zones/stack_zone.h" #include "../zones/stack_zone.h"
#include "../zones/table_zone.h" #include "../zones/table_zone.h"
#include "../zones/view_zone.h" #include "../zones/view_zone.h"
#include "color.h"
#include "pb/command_attach_card.pb.h" #include "pb/command_attach_card.pb.h"
#include "pb/command_set_card_counter.pb.h" #include "pb/command_set_card_counter.pb.h"
#include "pb/event_create_arrow.pb.h" #include "pb/event_create_arrow.pb.h"
@ -22,6 +21,7 @@
#include "pb/serverinfo_user.pb.h" #include "pb/serverinfo_user.pb.h"
#include "pb/serverinfo_zone.pb.h" #include "pb/serverinfo_zone.pb.h"
#include "player_target.h" #include "player_target.h"
#include "utility/color.h"
#include <QDebug> #include <QDebug>
#include <QMenu> #include <QMenu>

2
cockatrice/src/interface/pixel_map_generator.h
View file

@ -7,7 +7,7 @@
#ifndef PIXMAPGENERATOR_H #ifndef PIXMAPGENERATOR_H
#define PIXMAPGENERATOR_H #define PIXMAPGENERATOR_H
#include "../../../libs/server/include/user_level.h" #include "server/user_level.h"
#include <QIcon> #include <QIcon>
#include <QLoggingCategory> #include <QLoggingCategory>

2
cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h
View file

@ -13,11 +13,11 @@
#include "mana_curve_widget.h" #include "mana_curve_widget.h"
#include "mana_devotion_widget.h" #include "mana_devotion_widget.h"
#include <../../../../../libs/deck/deck_list.h>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QScrollArea> #include <QScrollArea>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QWidget> #include <QWidget>
#include <deck_list/deck_list.h>
class DeckAnalyticsWidget : public QWidget class DeckAnalyticsWidget : public QWidget
{ {

2
cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp
View file

@ -6,9 +6,9 @@
#include "card/card_database/card_database.h" #include "card/card_database/card_database.h"
#include "card/card_database/card_database_manager.h" #include "card/card_database/card_database_manager.h"
#include <../../../../../libs/deck/deck_list.h>
#include <QHash> #include <QHash>
#include <QRegularExpression> #include <QRegularExpression>
#include <deck_list/deck_list.h>
ManaBaseWidget::ManaBaseWidget(QWidget *parent, DeckListModel *_deckListModel) ManaBaseWidget::ManaBaseWidget(QWidget *parent, DeckListModel *_deckListModel)
: QWidget(parent), deckListModel(_deckListModel) : QWidget(parent), deckListModel(_deckListModel)

2
cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h
View file

@ -10,9 +10,9 @@
#include "../../../deck/deck_list_model.h" #include "../../../deck/deck_list_model.h"
#include "../general/display/banner_widget.h" #include "../general/display/banner_widget.h"
#include <../../../../../libs/deck/deck_list.h>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QWidget> #include <QWidget>
#include <deck_list/deck_list.h>
#include <utility> #include <utility>
class ManaBaseWidget : public QWidget class ManaBaseWidget : public QWidget

2
cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp
View file

@ -7,7 +7,7 @@
#include "card/card_database/card_database.h" #include "card/card_database/card_database.h"
#include "card/card_database/card_database_manager.h" #include "card/card_database/card_database_manager.h"
#include <../../../../../libs/deck/deck_list.h> #include <deck_list/deck_list.h>
#include <unordered_map> #include <unordered_map>
ManaCurveWidget::ManaCurveWidget(QWidget *parent, DeckListModel *_deckListModel) ManaCurveWidget::ManaCurveWidget(QWidget *parent, DeckListModel *_deckListModel)

2
cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp
View file

@ -7,7 +7,7 @@
#include "card/card_database/card_database.h" #include "card/card_database/card_database.h"
#include "card/card_database/card_database_manager.h" #include "card/card_database/card_database_manager.h"
#include <../../../../../libs/deck/deck_list.h> #include <deck_list/deck_list.h>
#include <iostream> #include <iostream>
#include <regex> #include <regex>
#include <string> #include <string>

2
cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h
View file

@ -10,9 +10,9 @@
#include "../../../deck/deck_list_model.h" #include "../../../deck/deck_list_model.h"
#include "../general/display/banner_widget.h" #include "../general/display/banner_widget.h"
#include <../../../../../libs/deck/deck_list.h>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QWidget> #include <QWidget>
#include <deck_list/deck_list.h>
#include <utility> #include <utility>
class ManaDevotionWidget : public QWidget class ManaDevotionWidget : public QWidget

2
cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
View file

@ -3,13 +3,13 @@
#include "card/card_database/card_database_manager.h" #include "card/card_database/card_database_manager.h"
#include "settings/cache_settings.h" #include "settings/cache_settings.h"
#include <../../../../../libs/utility/include/utility/trice_limits.h>
#include <QComboBox> #include <QComboBox>
#include <QDockWidget> #include <QDockWidget>
#include <QHeaderView> #include <QHeaderView>
#include <QLabel> #include <QLabel>
#include <QSplitter> #include <QSplitter>
#include <QTextEdit> #include <QTextEdit>
#include <utility/trice_limits.h>
DeckEditorDeckDockWidget::DeckEditorDeckDockWidget(AbstractTabDeckEditor *parent) DeckEditorDeckDockWidget::DeckEditorDeckDockWidget(AbstractTabDeckEditor *parent)
: QDockWidget(parent), deckEditor(parent) : QDockWidget(parent), deckEditor(parent)

2
cockatrice/src/server/abstract_client.cpp
View file

@ -1,6 +1,6 @@
#include "abstract_client.h" #include "abstract_client.h"
#include "../../../libs/server/get_pb_extension.h" #include "../../../libs/server/include/server/get_pb_extension.h"
#include "../../../libs/utility/include/utility/featureset.h" #include "../../../libs/utility/include/utility/featureset.h"
#include "pb/commands.pb.h" #include "pb/commands.pb.h"
#include "pb/event_add_to_list.pb.h" #include "pb/event_add_to_list.pb.h"

2
cockatrice/src/server/chat_view/chat_view.cpp
View file

@ -1,6 +1,6 @@
#include "chat_view.h" #include "chat_view.h"
#include "../../../../libs/server/include/user_level.h" #include "../../../../libs/server/include/server/user_level.h"
#include "../../client/sound_engine.h" #include "../../client/sound_engine.h"
#include "../../interface/pixel_map_generator.h" #include "../../interface/pixel_map_generator.h"
#include "../../tabs/tab_account.h" #include "../../tabs/tab_account.h"

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

@ -8,8 +8,8 @@
#ifndef CHATVIEW_H #ifndef CHATVIEW_H
#define CHATVIEW_H #define CHATVIEW_H
#include "../../../../libs/server/include/room_message_type.h" #include "../../../../libs/server/include/server/room_message_type.h"
#include "../../../../libs/server/include/user_level.h" #include "../../../../libs/server/include/server/user_level.h"
#include "../../tabs/tab_supervisor.h" #include "../../tabs/tab_supervisor.h"
#include "../user/user_list_widget.h" #include "../user/user_list_widget.h"

2
cockatrice/src/server/local_client.cpp
View file

@ -1,6 +1,6 @@
#include "local_client.h" #include "local_client.h"
#include "../../../libs/server/debug_pb_message.h" #include "../../../libs/server/include/server/debug_pb_message.h"
#include "local_server_interface.h" #include "local_server_interface.h"
#include "pb/session_commands.pb.h" #include "pb/session_commands.pb.h"

4
cockatrice/src/server/remote/remote_client.cpp
View file

@ -1,7 +1,5 @@
#include "remote_client.h" #include "remote_client.h"
#include "../../../../libs/server/debug_pb_message.h"
#include "../../../../libs/utility/passwordhasher.h"
#include "../../main.h" #include "../../main.h"
#include "../pending_command.h" #include "../pending_command.h"
#include "pb/event_server_identification.pb.h" #include "pb/event_server_identification.pb.h"
@ -12,7 +10,9 @@
#include "pb/response_register.pb.h" #include "pb/response_register.pb.h"
#include "pb/server_message.pb.h" #include "pb/server_message.pb.h"
#include "pb/session_commands.pb.h" #include "pb/session_commands.pb.h"
#include "server/debug_pb_message.h"
#include "settings/cache_settings.h" #include "settings/cache_settings.h"
#include "utility/passwordhasher.h"
#include "version_string.h" #include "version_string.h"
#include <QCryptographicHash> #include <QCryptographicHash>

2
cockatrice/src/server/user/user_context_menu.h
View file

@ -7,7 +7,7 @@
#ifndef USER_CONTEXT_MENU_H #ifndef USER_CONTEXT_MENU_H
#define USER_CONTEXT_MENU_H #define USER_CONTEXT_MENU_H
#include "../../../../libs/server/include/user_level.h" #include "../../../../libs/server/include/server/user_level.h"
#include <QObject> #include <QObject>

2
cockatrice/src/server/user/user_info_box.cpp
View file

@ -1,6 +1,5 @@
#include "user_info_box.h" #include "user_info_box.h"
#include "../../../../libs/utility/passwordhasher.h"
#include "../../client/get_text_with_max.h" #include "../../client/get_text_with_max.h"
#include "../../dialogs/dlg_edit_avatar.h" #include "../../dialogs/dlg_edit_avatar.h"
#include "../../dialogs/dlg_edit_password.h" #include "../../dialogs/dlg_edit_password.h"
@ -11,6 +10,7 @@
#include "pb/response_get_user_info.pb.h" #include "pb/response_get_user_info.pb.h"
#include "pb/serverinfo_user.pb.h" #include "pb/serverinfo_user.pb.h"
#include "pb/session_commands.pb.h" #include "pb/session_commands.pb.h"
#include "utility/passwordhasher.h"
#include <QDateTime> #include <QDateTime>
#include <QGridLayout> #include <QGridLayout>

2
cockatrice/src/server/user/user_list_widget.h
View file

@ -7,7 +7,7 @@
#ifndef USERLIST_H #ifndef USERLIST_H
#define USERLIST_H #define USERLIST_H
#include "../../../../libs/server/include/user_level.h" #include "../../../../libs/server/include/server/user_level.h"
#include "pb/moderator_commands.pb.h" #include "pb/moderator_commands.pb.h"
#include <QComboBox> #include <QComboBox>

2
cockatrice/src/tabs/tab_deck_storage.cpp
View file

@ -1,10 +1,10 @@
#include "tab_deck_storage.h" #include "tab_deck_storage.h"
#include "../../../libs/deck/deck_list.h"
#include "../client/get_text_with_max.h" #include "../client/get_text_with_max.h"
#include "../deck/deck_loader.h" #include "../deck/deck_loader.h"
#include "../server/pending_command.h" #include "../server/pending_command.h"
#include "../server/remote/remote_decklist_tree_widget.h" #include "../server/remote/remote_decklist_tree_widget.h"
#include "deck_list/deck_list.h"
#include "pb/command_deck_del.pb.h" #include "pb/command_deck_del.pb.h"
#include "pb/command_deck_del_dir.pb.h" #include "pb/command_deck_del_dir.pb.h"
#include "pb/command_deck_download.pb.h" #include "pb/command_deck_download.pb.h"

2
cockatrice/src/tabs/tab_room.cpp
View file

@ -1,6 +1,6 @@
#include "tab_room.h" #include "tab_room.h"
#include "../../../libs/server/get_pb_extension.h" #include "../../../libs/server/include/server/get_pb_extension.h"
#include "../../../libs/utility/include/utility/trice_limits.h" #include "../../../libs/utility/include/utility/trice_limits.h"
#include "../dialogs/dlg_settings.h" #include "../dialogs/dlg_settings.h"
#include "../main.h" #include "../main.h"

9
libs/deck_list/CMakeLists.txt
View file

@ -16,7 +16,7 @@ elseif (Qt5_FOUND)
qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif () endif ()
qt_add_library(cardlib STATIC qt_add_library(cockatrice_deck_list STATIC
src/abstract_deck_list_card_node.cpp src/abstract_deck_list_card_node.cpp
src/abstract_deck_list_node.cpp src/abstract_deck_list_node.cpp
src/deck_list.cpp src/deck_list.cpp
@ -25,12 +25,11 @@ qt_add_library(cardlib STATIC
${MOC_SOURCES} ${MOC_SOURCES}
) )
target_include_directories(deck_list target_include_directories(cockatrice_deck_list
PUBLIC include PUBLIC include
PUBLIC ${CMAKE_SOURCE_DIR}/libs/utility/include PUBLIC ${CMAKE_SOURCE_DIR}/libs/utility/include
) )
target_link_libraries(deck_list target_link_libraries(cockatrice_deck_list
utility PUBLIC utility ${COCKATRICE_QT_MODULES}
PUBLIC ${COCKATRICE_QT_MODULES}
) )

4
libs/pb/CMakeLists.txt
View file

@ -190,8 +190,8 @@ if(${Protobuf_VERSION} VERSION_LESS "3.21.0.0")
else() else()
add_library(cockatrice_protocol ${PROTO_FILES}) add_library(cockatrice_protocol ${PROTO_FILES})
target_link_libraries(cockatrice_protocol PUBLIC protobuf::libprotobuf) target_link_libraries(cockatrice_protocol PUBLIC protobuf::libprotobuf)
set(PROTO_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}") set(PROTO_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/pb")
target_include_directories(cockatrice_protocol PUBLIC "${PROTOBUF_INCLUDE_DIRS}") target_include_directories(cockatrice_protocol PUBLIC "${PROTOBUF_INCLUDE_DIRS}" PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
protobuf_generate( protobuf_generate(
TARGET cockatrice_protocol IMPORT_DIRS "${CMAKE_CURRENT_LIST_DIR}" PROTOC_OUT_DIR "${PROTO_BINARY_DIR}" TARGET cockatrice_protocol IMPORT_DIRS "${CMAKE_CURRENT_LIST_DIR}" PROTOC_OUT_DIR "${PROTO_BINARY_DIR}"

3
libs/rng/CMakeLists.txt
View file

@ -24,4 +24,7 @@ add_library(cockatrice_rng STATIC
target_include_directories(cockatrice_rng target_include_directories(cockatrice_rng
PUBLIC include PUBLIC include
PUBLIC include/sfmt PUBLIC include/sfmt
)
target_link_libraries(cockatrice_rng PUBLIC ${COCKATRICE_QT_MODULES}
) )

41
libs/server/CMakeLists.txt
View file

@ -3,23 +3,25 @@ set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
set(HEADERS set(HEADERS
include/game/server_abstract_participant.h include/server/game/server_abstract_participant.h
include/game/server_arrow.h include/server/game/server_arrow.h
include/game/server_arrowtarget.h include/server/game/server_arrowtarget.h
include/game/server_card.h include/server/game/server_card.h
include/game/server_cardzone.h include/server/game/server_cardzone.h
include/game/server_counter.h include/server/game/server_counter.h
include/game/server_game.h include/server/game/server_game.h
include/game/server_player.h include/server/game/server_player.h
include/game/server_spectator.h include/server/game/server_spectator.h
include/server.h include/server/debug_pb_message.h
include/server_abstractuserinterface.h include/server/get_pb_extension.h
include/server_database_interface.h include/server/server.h
include/server_protocolhandler.h include/server/server_abstractuserinterface.h
include/server_remoteuserinterface.h include/server/server_database_interface.h
include/server_response_containers.h include/server/server_protocolhandler.h
include/server_room.h include/server/server_remoteuserinterface.h
include/serverinfo_user_container.h include/server/server_response_containers.h
include/server/server_room.h
include/server/serverinfo_user_container.h
) )
if (Qt6_FOUND) if (Qt6_FOUND)
@ -38,6 +40,8 @@ add_library(serverlib STATIC
src/game/server_game.cpp src/game/server_game.cpp
src/game/server_player.cpp src/game/server_player.cpp
src/game/server_spectator.cpp src/game/server_spectator.cpp
src/debug_pb_message.cpp
src/get_pb_extension.cpp
src/server.cpp src/server.cpp
src/server_abstractuserinterface.cpp src/server_abstractuserinterface.cpp
src/server_database_interface.cpp src/server_database_interface.cpp
@ -54,9 +58,10 @@ target_include_directories(serverlib
PUBLIC ${CMAKE_SOURCE_DIR}/common PUBLIC ${CMAKE_SOURCE_DIR}/common
PUBLIC ${CMAKE_SOURCE_DIR}/libs/pb PUBLIC ${CMAKE_SOURCE_DIR}/libs/pb
PUBLIC ${CMAKE_SOURCE_DIR}/libs/utility PUBLIC ${CMAKE_SOURCE_DIR}/libs/utility
PUBLIC ${CMAKE_BINARY_DIR}/libs/pb
) )
# Make serverlib depend on cockatrice_protocol # Make serverlib depend on cockatrice_protocol
target_link_libraries(serverlib target_link_libraries(serverlib
PUBLIC cockatrice_common cockatrice_protocol utility ${COCKATRICE_QT_MODULES} PUBLIC cockatrice_common cockatrice_protocol utility cockatrice_rng cockatrice_deck_list ${COCKATRICE_QT_MODULES}
) )

0
libs/server/debug_pb_message.h → libs/server/include/server/debug_pb_message.h
View file

0
libs/server/include/game/server_abstract_participant.h → libs/server/include/server/game/server_abstract_participant.h
View file

0
libs/server/include/game/server_arrow.h → libs/server/include/server/game/server_arrow.h
View file

0
libs/server/include/game/server_arrowtarget.h → libs/server/include/server/game/server_arrowtarget.h
View file

0
libs/server/include/game/server_card.h → libs/server/include/server/game/server_card.h
View file

0
libs/server/include/game/server_cardzone.h → libs/server/include/server/game/server_cardzone.h
View file

0
libs/server/include/game/server_counter.h → libs/server/include/server/game/server_counter.h
View file

0
libs/server/include/game/server_game.h → libs/server/include/server/game/server_game.h
View file

0
libs/server/include/game/server_player.h → libs/server/include/server/game/server_player.h
View file

0
libs/server/include/game/server_spectator.h → libs/server/include/server/game/server_spectator.h
View file

0
libs/server/get_pb_extension.h → libs/server/include/server/get_pb_extension.h
View file

0
libs/server/include/room_message_type.h → libs/server/include/server/room_message_type.h
View file

0
libs/server/include/server.h → libs/server/include/server/server.h
View file

0
libs/server/include/server_abstractuserinterface.h → libs/server/include/server/server_abstractuserinterface.h
View file

0
libs/server/include/server_database_interface.h → libs/server/include/server/server_database_interface.h
View file

0
libs/server/include/server_player_reference.h → libs/server/include/server/server_player_reference.h
View file

0
libs/server/include/server_protocolhandler.h → libs/server/include/server/server_protocolhandler.h
View file

0
libs/server/include/server_remoteuserinterface.h → libs/server/include/server/server_remoteuserinterface.h
View file

0
libs/server/include/server_response_containers.h → libs/server/include/server/server_response_containers.h
View file

2
libs/server/include/server_room.h → libs/server/include/server/server_room.h
View file

@ -1,9 +1,9 @@
#ifndef SERVER_ROOM_H #ifndef SERVER_ROOM_H
#define SERVER_ROOM_H #define SERVER_ROOM_H
#include "../serverinfo_user_container.h"
#include "pb/response.pb.h" #include "pb/response.pb.h"
#include "pb/serverinfo_chat_message.pb.h" #include "pb/serverinfo_chat_message.pb.h"
#include "serverinfo_user_container.h"
#include <QList> #include <QList>
#include <QMap> #include <QMap>

0
libs/server/include/serverinfo_user_container.h → libs/server/include/server/serverinfo_user_container.h
View file

0
libs/server/include/user_level.h → libs/server/include/server/user_level.h
View file

4
libs/server/debug_pb_message.cpp → libs/server/src/debug_pb_message.cpp
View file

@ -1,6 +1,6 @@
#include "../../common/debug_pb_message.h" #include "../include/server/debug_pb_message.h"
#include "../utility/include/utility/trice_limits.h" #include "utility/trice_limits.h"
#include <QList> #include <QList>
#include <QString> #include <QString>

34
libs/server/src/game/server_abstract_participant.cpp
View file

@ -1,21 +1,18 @@
#include "../../include/game/server_abstract_participant.h" #include "../../include/server/game/server_abstract_participant.h"
#include "../../color.h" #include "../../include/server/game/server_arrow.h"
#include "../../deck_list.h" #include "../../include/server/game/server_card.h"
#include "../../deck_list_card_node.h" #include "../../include/server/game/server_cardzone.h"
#include "../../game/server_arrow.h" #include "../../include/server/game/server_counter.h"
#include "../../game/server_counter.h" #include "../../include/server/game/server_game.h"
#include "../../get_pb_extension.h" #include "../../include/server/game/server_player.h"
#include "../../include/game/server_card.h" #include "../../include/server/get_pb_extension.h"
#include "../../include/game/server_cardzone.h" #include "../../include/server/server.h"
#include "../../include/game/server_game.h" #include "../../include/server/server_database_interface.h"
#include "../../include/game/server_player.h" #include "../../include/server/server_room.h"
#include "../../rng_abstract.h" #include "../include/server/server_abstractuserinterface.h"
#include "../../trice_limits.h" #include "deck_list/deck_list.h"
#include "../server.h" #include "deck_list/deck_list_card_node.h"
#include "../server_abstractuserinterface.h"
#include "../server_database_interface.h"
#include "../server_room.h"
#include "pb/command_attach_card.pb.h" #include "pb/command_attach_card.pb.h"
#include "pb/command_change_zone_properties.pb.h" #include "pb/command_change_zone_properties.pb.h"
#include "pb/command_concede.pb.h" #include "pb/command_concede.pb.h"
@ -82,6 +79,9 @@
#include "pb/response_dump_zone.pb.h" #include "pb/response_dump_zone.pb.h"
#include "pb/serverinfo_player.pb.h" #include "pb/serverinfo_player.pb.h"
#include "pb/serverinfo_user.pb.h" #include "pb/serverinfo_user.pb.h"
#include "rng/rng_abstract.h"
#include "utility/color.h"
#include "utility/trice_limits.h"
#include <QDebug> #include <QDebug>
#include <QRegularExpression> #include <QRegularExpression>

8
libs/server/src/game/server_arrow.cpp
View file

@ -1,8 +1,8 @@
#include "../../include/game/server_arrow.h" #include "../../include/server/game/server_arrow.h"
#include "../../include/game/server_card.h" #include "../../include/server/game/server_card.h"
#include "../../include/game/server_cardzone.h" #include "../../include/server/game/server_cardzone.h"
#include "../../include/game/server_player.h" #include "../../include/server/game/server_player.h"
#include "pb/serverinfo_arrow.pb.h" #include "pb/serverinfo_arrow.pb.h"
Server_Arrow::Server_Arrow(int _id, Server_Card *_startCard, Server_ArrowTarget *_targetItem, const color &_arrowColor) Server_Arrow::Server_Arrow(int _id, Server_Card *_startCard, Server_ArrowTarget *_targetItem, const color &_arrowColor)

2
libs/server/src/game/server_arrowtarget.cpp
View file

@ -1,2 +1,2 @@
#include "../../include/game/server_arrowtarget.h" #include "../../include/server/game/server_arrowtarget.h"

6
libs/server/src/game/server_card.cpp
View file

@ -17,10 +17,10 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#include "../../include/game/server_card.h" #include "../../include/server/game/server_card.h"
#include "../../include/game/server_cardzone.h" #include "../../include/server/game/server_cardzone.h"
#include "../../include/game/server_player.h" #include "../../include/server/game/server_player.h"
#include "pb/event_set_card_attr.pb.h" #include "pb/event_set_card_attr.pb.h"
#include "pb/event_set_card_counter.pb.h" #include "pb/event_set_card_counter.pb.h"
#include "pb/serverinfo_card.pb.h" #include "pb/serverinfo_card.pb.h"

8
libs/server/src/game/server_cardzone.cpp
View file

@ -17,12 +17,12 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#include "../../include/game/server_cardzone.h" #include "../../include/server/game/server_cardzone.h"
#include "../../include/game/server_card.h" #include "../../include/server/game/server_card.h"
#include "../../include/game/server_player.h" #include "../../include/server/game/server_player.h"
#include "../rng_abstract.h"
#include "pb/command_move_card.pb.h" #include "pb/command_move_card.pb.h"
#include "rng/rng_abstract.h"
#include <QDebug> #include <QDebug>
#include <QSet> #include <QSet>

2
libs/server/src/game/server_counter.cpp
View file

@ -1,4 +1,4 @@
#include "../../include/game/server_counter.h" #include "../../include/server/game/server_counter.h"
#include "pb/serverinfo_counter.pb.h" #include "pb/serverinfo_counter.pb.h"

22
libs/server/src/game/server_game.cpp
View file

@ -17,18 +17,18 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#include "../../include/game/server_game.h" #include "../../include/server/game/server_game.h"
#include "../../deck_list.h" #include "../../include/server/game/server_arrow.h"
#include "../../include/game/server_arrow.h" #include "../../include/server/game/server_card.h"
#include "../../include/game/server_card.h" #include "../../include/server/game/server_cardzone.h"
#include "../../include/game/server_cardzone.h" #include "../../include/server/game/server_player.h"
#include "../../include/game/server_player.h" #include "../../include/server/game/server_spectator.h"
#include "../../include/game/server_spectator.h" #include "../../include/server/server.h"
#include "../server.h" #include "../../include/server/server_database_interface.h"
#include "../server_database_interface.h" #include "../../include/server/server_protocolhandler.h"
#include "../server_protocolhandler.h" #include "../../include/server/server_room.h"
#include "../server_room.h" #include "deck_list/deck_list.h"
#include "pb/context_connection_state_changed.pb.h" #include "pb/context_connection_state_changed.pb.h"
#include "pb/context_deck_select.pb.h" #include "pb/context_deck_select.pb.h"
#include "pb/context_ping_changed.pb.h" #include "pb/context_ping_changed.pb.h"

32
libs/server/src/game/server_player.cpp
View file

@ -1,20 +1,17 @@
#include "../../include/game/server_player.h" #include "../../include/server/game/server_player.h"
#include "../../color.h" #include "../../include/server/game/server_arrow.h"
#include "../../deck_list.h" #include "../../include/server/game/server_card.h"
#include "../../deck_list_card_node.h" #include "../../include/server/game/server_cardzone.h"
#include "../../get_pb_extension.h" #include "../../include/server/game/server_counter.h"
#include "../../include/game/server_arrow.h" #include "../../include/server/game/server_game.h"
#include "../../include/game/server_card.h" #include "../../include/server/get_pb_extension.h"
#include "../../include/game/server_cardzone.h" #include "../../include/server/server.h"
#include "../../include/game/server_counter.h" #include "../../include/server/server_database_interface.h"
#include "../../include/game/server_game.h" #include "../../include/server/server_room.h"
#include "../../rng_abstract.h" #include "../include/server/server_abstractuserinterface.h"
#include "../../trice_limits.h" #include "deck_list/deck_list.h"
#include "../server.h" #include "deck_list/deck_list_card_node.h"
#include "../server_abstractuserinterface.h"
#include "../server_database_interface.h"
#include "../server_room.h"
#include "pb/command_attach_card.pb.h" #include "pb/command_attach_card.pb.h"
#include "pb/command_change_zone_properties.pb.h" #include "pb/command_change_zone_properties.pb.h"
#include "pb/command_concede.pb.h" #include "pb/command_concede.pb.h"
@ -81,6 +78,9 @@
#include "pb/response_dump_zone.pb.h" #include "pb/response_dump_zone.pb.h"
#include "pb/serverinfo_player.pb.h" #include "pb/serverinfo_player.pb.h"
#include "pb/serverinfo_user.pb.h" #include "pb/serverinfo_user.pb.h"
#include "rng/rng_abstract.h"
#include "utility/color.h"
#include "utility/trice_limits.h"
#include <QDebug> #include <QDebug>
#include <QRegularExpression> #include <QRegularExpression>

2
libs/server/src/game/server_spectator.cpp
View file

@ -1,4 +1,4 @@
#include "../../include/game/server_spectator.h" #include "../../include/server/game/server_spectator.h"
Server_Spectator::Server_Spectator(Server_Game *_game, Server_Spectator::Server_Spectator(Server_Game *_game,
int _playerId, int _playerId,

2
libs/server/get_pb_extension.cpp → libs/server/src/get_pb_extension.cpp
View file

@ -1,4 +1,4 @@
#include "get_pb_extension.h" #include "../include/server/get_pb_extension.h"
#include <google/protobuf/descriptor.h> #include <google/protobuf/descriptor.h>
#include <google/protobuf/message.h> #include <google/protobuf/message.h>

18
libs/server/src/server.cpp
View file

@ -17,22 +17,22 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#include "../include/server.h" #include "../include/server/server.h"
#include "../debug_pb_message.h" #include "../include/server/debug_pb_message.h"
#include "../featureset.h" #include "../include/server/game/server_game.h"
#include "../include/game/server_game.h" #include "../include/server/game/server_player.h"
#include "../include/game/server_player.h" #include "../include/server/server_database_interface.h"
#include "../include/server_database_interface.h" #include "../include/server/server_protocolhandler.h"
#include "../include/server_protocolhandler.h" #include "../include/server/server_remoteuserinterface.h"
#include "../include/server_remoteuserinterface.h" #include "../include/server/server_room.h"
#include "../include/server_room.h"
#include "pb/event_connection_closed.pb.h" #include "pb/event_connection_closed.pb.h"
#include "pb/event_list_rooms.pb.h" #include "pb/event_list_rooms.pb.h"
#include "pb/event_user_joined.pb.h" #include "pb/event_user_joined.pb.h"
#include "pb/event_user_left.pb.h" #include "pb/event_user_left.pb.h"
#include "pb/isl_message.pb.h" #include "pb/isl_message.pb.h"
#include "pb/session_event.pb.h" #include "pb/session_event.pb.h"
#include "utility/featureset.h"
#include <QCoreApplication> #include <QCoreApplication>
#include <QDebug> #include <QDebug>

14
libs/server/src/server_abstractuserinterface.cpp
View file

@ -1,11 +1,11 @@
#include "../include/server_abstractuserinterface.h" #include "../include/server/server_abstractuserinterface.h"
#include "../include/game/server_game.h" #include "../include/server/game/server_game.h"
#include "../include/game/server_player.h" #include "../include/server/game/server_player.h"
#include "../include/server.h" #include "../include/server/server.h"
#include "../include/server_player_reference.h" #include "../include/server/server_player_reference.h"
#include "../include/server_response_containers.h" #include "../include/server/server_response_containers.h"
#include "../include/server_room.h" #include "../include/server/server_room.h"
#include "pb/event_game_joined.pb.h" #include "pb/event_game_joined.pb.h"
#include "pb/event_game_state_changed.pb.h" #include "pb/event_game_state_changed.pb.h"

2
libs/server/src/server_database_interface.cpp
View file

@ -1,2 +1,2 @@
#include "../include/server_database_interface.h" #include "../include/server/server_database_interface.h"

18
libs/server/src/server_protocolhandler.cpp
View file

@ -1,13 +1,11 @@
#include "../include/server_protocolhandler.h" #include "../include/server/server_protocolhandler.h"
#include "../debug_pb_message.h" #include "../include/server/debug_pb_message.h"
#include "../featureset.h" #include "../include/server/game/server_game.h"
#include "../get_pb_extension.h" #include "../include/server/game/server_player.h"
#include "../include/game/server_game.h" #include "../include/server/get_pb_extension.h"
#include "../include/game/server_player.h" #include "../include/server/server_database_interface.h"
#include "../include/server_database_interface.h" #include "../include/server/server_room.h"
#include "../include/server_room.h"
#include "../trice_limits.h"
#include "pb/commands.pb.h" #include "pb/commands.pb.h"
#include "pb/event_game_joined.pb.h" #include "pb/event_game_joined.pb.h"
#include "pb/event_list_rooms.pb.h" #include "pb/event_list_rooms.pb.h"
@ -22,6 +20,8 @@
#include "pb/response_list_users.pb.h" #include "pb/response_list_users.pb.h"
#include "pb/response_login.pb.h" #include "pb/response_login.pb.h"
#include "pb/serverinfo_user.pb.h" #include "pb/serverinfo_user.pb.h"
#include "utility/featureset.h"
#include "utility/trice_limits.h"
#include <QDateTime> #include <QDateTime>
#include <QDebug> #include <QDebug>

4
libs/server/src/server_remoteuserinterface.cpp
View file

@ -1,6 +1,6 @@
#include "../include/server_remoteuserinterface.h" #include "../include/server/server_remoteuserinterface.h"
#include "../include/server.h" #include "../include/server/server.h"
#include "pb/serverinfo_user.pb.h" #include "pb/serverinfo_user.pb.h"
void Server_RemoteUserInterface::sendProtocolItem(const Response &item) void Server_RemoteUserInterface::sendProtocolItem(const Response &item)

4
libs/server/src/server_response_containers.cpp
View file

@ -1,6 +1,6 @@
#include "../include/server_response_containers.h" #include "../include/server/server_response_containers.h"
#include "../include/game/server_game.h" #include "../include/server/game/server_game.h"
#include <google/protobuf/descriptor.h> #include <google/protobuf/descriptor.h>

8
libs/server/src/server_room.cpp
View file

@ -1,8 +1,7 @@
#include "../include/server_room.h" #include "../include/server/server_room.h"
#include "../include/game/server_game.h" #include "../include/server/game/server_game.h"
#include "../include/server_protocolhandler.h" #include "../include/server/server_protocolhandler.h"
#include "../trice_limits.h"
#include "pb/commands.pb.h" #include "pb/commands.pb.h"
#include "pb/event_join_room.pb.h" #include "pb/event_join_room.pb.h"
#include "pb/event_leave_room.pb.h" #include "pb/event_leave_room.pb.h"
@ -12,6 +11,7 @@
#include "pb/room_commands.pb.h" #include "pb/room_commands.pb.h"
#include "pb/serverinfo_chat_message.pb.h" #include "pb/serverinfo_chat_message.pb.h"
#include "pb/serverinfo_room.pb.h" #include "pb/serverinfo_room.pb.h"
#include "utility/trice_limits.h"
#include <QDateTime> #include <QDateTime>
#include <QDebug> #include <QDebug>

2
libs/server/src/serverinfo_user_container.cpp
View file

@ -1,4 +1,4 @@
#include "../../common/serverinfo_user_container.h" #include "../include/server/serverinfo_user_container.h"
#include "pb/serverinfo_user.pb.h" #include "pb/serverinfo_user.pb.h"

4
servatrice/src/isl_interface.cpp
View file

@ -1,7 +1,7 @@
#include "isl_interface.h" #include "isl_interface.h"
#include "../../libs/server/debug_pb_message.h" #include "../../libs/server/include/server/debug_pb_message.h"
#include "../../libs/server/get_pb_extension.h" #include "../../libs/server/include/server/get_pb_extension.h"
#include "main.h" #include "main.h"
#include "pb/event_game_joined.pb.h" #include "pb/event_game_joined.pb.h"
#include "pb/event_join_room.pb.h" #include "pb/event_join_room.pb.h"

2
servatrice/src/servatrice.cpp
View file

@ -19,8 +19,8 @@
***************************************************************************/ ***************************************************************************/
#include "servatrice.h" #include "servatrice.h"
#include "../../libs/deck/deck_list.h"
#include "../../libs/utility/include/utility/featureset.h" #include "../../libs/utility/include/utility/featureset.h"
#include "deck_list/deck_list.h"
#include "email_parser.h" #include "email_parser.h"
#include "isl_interface.h" #include "isl_interface.h"
#include "main.h" #include "main.h"

2
servatrice/src/servatrice_database_interface.cpp
View file

@ -1,7 +1,7 @@
#include "servatrice_database_interface.h" #include "servatrice_database_interface.h"
#include "../../libs/deck/deck_list.h"
#include "../../libs/utility/passwordhasher.h" #include "../../libs/utility/passwordhasher.h"
#include "deck_list/deck_list.h"
#include "pb/game_replay.pb.h" #include "pb/game_replay.pb.h"
#include "servatrice.h" #include "servatrice.h"
#include "serversocketinterface.h" #include "serversocketinterface.h"

2
servatrice/src/serversocketinterface.cpp
View file

@ -20,8 +20,8 @@
#include "serversocketinterface.h" #include "serversocketinterface.h"
#include "../../libs/deck/deck_list.h"
#include "../../libs/utility/include/utility/trice_limits.h" #include "../../libs/utility/include/utility/trice_limits.h"
#include "deck_list/deck_list.h"
#include "email_parser.h" #include "email_parser.h"
#include "main.h" #include "main.h"
#include "pb/command_deck_del.pb.h" #include "pb/command_deck_del.pb.h"

2
tests/loading_from_clipboard/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"") add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")
add_executable( add_executable(
loading_from_clipboard_test ../../libs/deck/deck_list.cpp clipboard_testing.cpp loading_from_clipboard_test.cpp loading_from_clipboard_test deck_list/deck_list.cpp clipboard_testing.cpp loading_from_clipboard_test.cpp
) )
if(NOT GTEST_FOUND) if(NOT GTEST_FOUND)

2
tests/loading_from_clipboard/clipboard_testing.cpp
View file

@ -1,6 +1,6 @@
#include "clipboard_testing.h" #include "clipboard_testing.h"
#include "../../libs/deck/deck_list_card_node.h" #include "deck_list/deck_list_card_node.h"
#include <QTextStream> #include <QTextStream>

2
tests/loading_from_clipboard/clipboard_testing.h
View file

@ -1,7 +1,7 @@
#ifndef CLIPBOARD_TESTING_H #ifndef CLIPBOARD_TESTING_H
#define CLIPBOARD_TESTING_H #define CLIPBOARD_TESTING_H
#include "../../libs/deck/deck_list.h" #include "deck_list/deck_list.h"
#include "gtest/gtest.h" #include "gtest/gtest.h"