mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-15 06:52:15 -07:00
Move local/remote client and local server files.
Took 32 minutes Took 8 seconds
This commit is contained in:
parent
484e177589
commit
4e7c98829a
47 changed files with 291 additions and 43 deletions
|
|
@ -205,16 +205,16 @@ set(cockatrice_SOURCES
|
|||
src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
|
||||
src/interface/window_main.cpp
|
||||
src/main.cpp
|
||||
src/server/abstract_client.cpp
|
||||
../libcockatrice_network/libcockatrice/client/abstract_client.cpp
|
||||
src/server/chat_view/chat_view.cpp
|
||||
src/server/game_selector.cpp
|
||||
src/server/games_model.cpp
|
||||
src/server/handle_public_servers.cpp
|
||||
src/server/local_client.cpp
|
||||
src/server/local_server.cpp
|
||||
src/server/local_server_interface.cpp
|
||||
../libcockatrice_network/libcockatrice/client/local/local_client.cpp
|
||||
../libcockatrice_network/libcockatrice/server/local/local_server.cpp
|
||||
../libcockatrice_network/libcockatrice/server/local/local_server_interface.cpp
|
||||
src/server/pending_command.cpp
|
||||
src/server/remote/remote_client.cpp
|
||||
../libcockatrice_network/libcockatrice/client/remote/remote_client.cpp
|
||||
src/server/remote/remote_decklist_tree_widget.cpp
|
||||
src/server/remote/remote_replay_list_tree_widget.cpp
|
||||
src/server/user/user_context_menu.cpp
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#include "game_event_handler.h"
|
||||
|
||||
#include "../server/abstract_client.h"
|
||||
#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
#include "../server/pending_command.h"
|
||||
#include "../tabs/tab_game.h"
|
||||
#include "abstract_game.h"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
#ifndef COCKATRICE_GAME_STATE_H
|
||||
#define COCKATRICE_GAME_STATE_H
|
||||
|
||||
#include "../server/abstract_client.h"
|
||||
#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QTimer>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#include "player_list_widget.h"
|
||||
|
||||
#include "../../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
#include "../../interface/pixel_map_generator.h"
|
||||
#include "../../server/abstract_client.h"
|
||||
#include "../../server/user/user_context_menu.h"
|
||||
#include "../../server/user/user_list_manager.h"
|
||||
#include "../../server/user/user_list_widget.h"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#include "home_widget.h"
|
||||
|
||||
#include "../../../server/remote/remote_client.h"
|
||||
#include "../../../../../libcockatrice_network/libcockatrice/client/remote/remote_client.h"
|
||||
#include "../../../tabs/tab_supervisor.h"
|
||||
#include "../../window_main.h"
|
||||
#include "background_sources.h"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
#ifndef HOME_WIDGET_H
|
||||
#define HOME_WIDGET_H
|
||||
#include "../../../server/abstract_client.h"
|
||||
#include "../../../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
#include "../../../tabs/tab_supervisor.h"
|
||||
#include "../cards/card_info_picture_art_crop_widget.h"
|
||||
#include "home_styled_button.h"
|
||||
|
|
|
|||
|
|
@ -19,6 +19,9 @@
|
|||
***************************************************************************/
|
||||
#include "window_main.h"
|
||||
|
||||
#include "../../../libcockatrice_network/libcockatrice/client/local/local_client.h"
|
||||
#include "../../../libcockatrice_network/libcockatrice/client/remote/remote_client.h"
|
||||
#include "../../../libcockatrice_network/libcockatrice/server/local/local_server.h"
|
||||
#include "../client/get_text_with_max.h"
|
||||
#include "../client/network/client_update_checker.h"
|
||||
#include "../client/network/release_channel.h"
|
||||
|
|
@ -35,10 +38,7 @@
|
|||
#include "../dialogs/dlg_update.h"
|
||||
#include "../dialogs/dlg_view_log.h"
|
||||
#include "../main.h"
|
||||
#include "../server/local_client.h"
|
||||
#include "../server/local_server.h"
|
||||
#include "../server/local_server_interface.h"
|
||||
#include "../server/remote/remote_client.h"
|
||||
#include "../tabs/tab_game.h"
|
||||
#include "../tabs/tab_supervisor.h"
|
||||
#include "version_string.h"
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
#ifndef WINDOW_H
|
||||
#define WINDOW_H
|
||||
|
||||
#include "../server/abstract_client.h"
|
||||
#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
|
||||
#include <QList>
|
||||
#include <QLoggingCategory>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
#include "game_selector.h"
|
||||
|
||||
#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
#include "../client/get_text_with_max.h"
|
||||
#include "../dialogs/dlg_create_game.h"
|
||||
#include "../dialogs/dlg_filter_games.h"
|
||||
|
|
@ -7,7 +8,6 @@
|
|||
#include "../tabs/tab_game.h"
|
||||
#include "../tabs/tab_room.h"
|
||||
#include "../tabs/tab_supervisor.h"
|
||||
#include "abstract_client.h"
|
||||
#include "games_model.h"
|
||||
#include "pending_command.h"
|
||||
#include "user/user_list_manager.h"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#include "remote_decklist_tree_widget.h"
|
||||
|
||||
#include "../abstract_client.h"
|
||||
#include "../../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
#include "../pending_command.h"
|
||||
|
||||
#include <QFileIconProvider>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#include "remote_replay_list_tree_widget.h"
|
||||
|
||||
#include "../abstract_client.h"
|
||||
#include "../../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
#include "../pending_command.h"
|
||||
|
||||
#include <QFileIconProvider>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
#include "user_context_menu.h"
|
||||
|
||||
#include "../../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
#include "../../tabs/tab_account.h"
|
||||
#include "../../tabs/tab_game.h"
|
||||
#include "../../tabs/tab_supervisor.h"
|
||||
#include "../abstract_client.h"
|
||||
#include "../chat_view/chat_view.h"
|
||||
#include "../game_selector.h"
|
||||
#include "../pending_command.h"
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
#include "user_info_box.h"
|
||||
|
||||
#include "../../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
#include "../../client/get_text_with_max.h"
|
||||
#include "../../dialogs/dlg_edit_avatar.h"
|
||||
#include "../../dialogs/dlg_edit_password.h"
|
||||
#include "../../dialogs/dlg_edit_user.h"
|
||||
#include "../../interface/pixel_map_generator.h"
|
||||
#include "../abstract_client.h"
|
||||
#include "../pending_command.h"
|
||||
|
||||
#include <QDateTime>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#include "user_list_manager.h"
|
||||
|
||||
#include "../../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
#include "../../client/sound_engine.h"
|
||||
#include "../abstract_client.h"
|
||||
#include "../pending_command.h"
|
||||
#include "user_info_box.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
#include "user_list_widget.h"
|
||||
|
||||
#include "../../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
#include "../../interface/pixel_map_generator.h"
|
||||
#include "../../tabs/tab_account.h"
|
||||
#include "../../tabs/tab_supervisor.h"
|
||||
#include "../abstract_client.h"
|
||||
#include "../game_selector.h"
|
||||
#include "../pending_command.h"
|
||||
#include "user_context_menu.h"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
#include "abstract_tab_deck_editor.h"
|
||||
|
||||
#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
#include "../client/tapped_out_interface.h"
|
||||
#include "../deck/deck_stats_interface.h"
|
||||
#include "../dialogs/dlg_load_deck.h"
|
||||
|
|
@ -8,7 +9,6 @@
|
|||
#include "../interface/card_picture_loader/card_picture_loader.h"
|
||||
#include "../interface/pixel_map_generator.h"
|
||||
#include "../interface/widgets/cards/card_info_frame_widget.h"
|
||||
#include "../server/abstract_client.h"
|
||||
#include "../server/pending_command.h"
|
||||
#include "tab_supervisor.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#include "tab_account.h"
|
||||
|
||||
#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
#include "../client/sound_engine.h"
|
||||
#include "../deck/custom_line_edit.h"
|
||||
#include "../server/abstract_client.h"
|
||||
#include "../server/pending_command.h"
|
||||
#include "../server/user/user_info_box.h"
|
||||
#include "../server/user/user_list_manager.h"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#include "tab_admin.h"
|
||||
|
||||
#include "../server/abstract_client.h"
|
||||
#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
#include "../server/pending_command.h"
|
||||
|
||||
#include <QDialogButtonBox>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
#include "tab_deck_editor.h"
|
||||
|
||||
#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
#include "../client/deck_editor_menu.h"
|
||||
#include "../client/tapped_out_interface.h"
|
||||
#include "../dialogs/dlg_load_deck.h"
|
||||
|
|
@ -9,7 +10,6 @@
|
|||
#include "../interface/pixel_map_generator.h"
|
||||
#include "../interface/widgets/cards/card_info_frame_widget.h"
|
||||
#include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h"
|
||||
#include "../server/abstract_client.h"
|
||||
#include "../server/pending_command.h"
|
||||
#include "tab_supervisor.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
#ifndef TAB_DECK_STORAGE_H
|
||||
#define TAB_DECK_STORAGE_H
|
||||
|
||||
#include "../server/abstract_client.h"
|
||||
#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
#include "../server/remote/remote_decklist_tree_widget.h"
|
||||
#include "tab.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
#include "tab_game.h"
|
||||
|
||||
#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
#include "../client/network/replay_timeline_widget.h"
|
||||
#include "../dialogs/dlg_create_game.h"
|
||||
#include "../game/board/arrow_item.h"
|
||||
|
|
@ -20,7 +21,6 @@
|
|||
#include "../interface/widgets/cards/card_info_frame_widget.h"
|
||||
#include "../interface/window_main.h"
|
||||
#include "../main.h"
|
||||
#include "../server/abstract_client.h"
|
||||
#include "../server/user/user_list_manager.h"
|
||||
#include "tab_supervisor.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
#ifndef TAB_HOME_H
|
||||
#define TAB_HOME_H
|
||||
|
||||
#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
#include "../interface/widgets/general/home_widget.h"
|
||||
#include "../server/abstract_client.h"
|
||||
#include "tab.h"
|
||||
|
||||
#include <QHBoxLayout>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#include "tab_logs.h"
|
||||
|
||||
#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
#include "../deck/custom_line_edit.h"
|
||||
#include "../dialogs/dlg_manage_sets.h"
|
||||
#include "../server/abstract_client.h"
|
||||
#include "../server/pending_command.h"
|
||||
|
||||
#include <QCheckBox>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
#include "tab_message.h"
|
||||
|
||||
#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
#include "../client/sound_engine.h"
|
||||
#include "../deck/custom_line_edit.h"
|
||||
#include "../main.h"
|
||||
#include "../server/abstract_client.h"
|
||||
#include "../server/chat_view/chat_view.h"
|
||||
#include "../server/pending_command.h"
|
||||
#include "../server/user/user_list_manager.h"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#include "tab_replays.h"
|
||||
|
||||
#include "../server/abstract_client.h"
|
||||
#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
#include "../server/pending_command.h"
|
||||
#include "../server/remote/remote_replay_list_tree_widget.h"
|
||||
#include "tab_game.h"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
#ifndef TAB_REPLAYS_H
|
||||
#define TAB_REPLAYS_H
|
||||
|
||||
#include "../server/abstract_client.h"
|
||||
#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
#include "tab.h"
|
||||
|
||||
class ServerInfo_User;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#include "tab_room.h"
|
||||
|
||||
#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
#include "../dialogs/dlg_settings.h"
|
||||
#include "../main.h"
|
||||
#include "../server/abstract_client.h"
|
||||
#include "../server/chat_view/chat_view.h"
|
||||
#include "../server/game_selector.h"
|
||||
#include "../server/pending_command.h"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#include "tab_server.h"
|
||||
|
||||
#include "../server/abstract_client.h"
|
||||
#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
#include "../server/pending_command.h"
|
||||
#include "../server/user/user_list_widget.h"
|
||||
#include "tab_supervisor.h"
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#include "tab_supervisor.h"
|
||||
|
||||
#include "../../../libcockatrice_network/libcockatrice/client/abstract_client.h"
|
||||
#include "../interface/pixel_map_generator.h"
|
||||
#include "../main.h"
|
||||
#include "../server/abstract_client.h"
|
||||
#include "../server/user/user_list_manager.h"
|
||||
#include "../server/user/user_list_widget.h"
|
||||
#include "api/edhrec/tab_edhrec_main.h"
|
||||
|
|
|
|||
31
libcockatrice_network/CMakeLists.txt
Normal file
31
libcockatrice_network/CMakeLists.txt
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
set(HEADERS
|
||||
local_client.h
|
||||
)
|
||||
|
||||
set(SOURCES
|
||||
local_client.cpp
|
||||
)
|
||||
|
||||
if (Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif (Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif ()
|
||||
|
||||
add_library(
|
||||
libcockatrice_network_client_local STATIC
|
||||
${MOC_SOURCES}
|
||||
${SOURCES}
|
||||
)
|
||||
|
||||
# add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper)
|
||||
|
||||
target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
target_link_libraries(
|
||||
libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES}
|
||||
)
|
||||
31
libcockatrice_network/libcockatrice/CMakeLists.txt
Normal file
31
libcockatrice_network/libcockatrice/CMakeLists.txt
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
set(HEADERS
|
||||
local_client.h
|
||||
)
|
||||
|
||||
set(SOURCES
|
||||
local_client.cpp
|
||||
)
|
||||
|
||||
if (Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif (Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif ()
|
||||
|
||||
add_library(
|
||||
libcockatrice_network_client_local STATIC
|
||||
${MOC_SOURCES}
|
||||
${SOURCES}
|
||||
)
|
||||
|
||||
# add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper)
|
||||
|
||||
target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
target_link_libraries(
|
||||
libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES}
|
||||
)
|
||||
31
libcockatrice_network/libcockatrice/client/CMakeLists.txt
Normal file
31
libcockatrice_network/libcockatrice/client/CMakeLists.txt
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
set(HEADERS
|
||||
local_client.h
|
||||
)
|
||||
|
||||
set(SOURCES
|
||||
local_client.cpp
|
||||
)
|
||||
|
||||
if (Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif (Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif ()
|
||||
|
||||
add_library(
|
||||
libcockatrice_network_client_local STATIC
|
||||
${MOC_SOURCES}
|
||||
${SOURCES}
|
||||
)
|
||||
|
||||
# add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper)
|
||||
|
||||
target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
target_link_libraries(
|
||||
libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES}
|
||||
)
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#include "abstract_client.h"
|
||||
#include "../../../cockatrice/src/server/abstract_client.h"
|
||||
|
||||
#include "pending_command.h"
|
||||
#include "../../../cockatrice/src/server/pending_command.h"
|
||||
|
||||
#include <google/protobuf/descriptor.h>
|
||||
#include <libcockatrice/protocol/pb/commands.pb.h>
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
set(HEADERS
|
||||
local_client.h
|
||||
)
|
||||
|
||||
set(SOURCES
|
||||
local_client.cpp
|
||||
)
|
||||
|
||||
if (Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif (Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif ()
|
||||
|
||||
add_library(
|
||||
libcockatrice_network_client_local STATIC
|
||||
${MOC_SOURCES}
|
||||
${SOURCES}
|
||||
)
|
||||
|
||||
# add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper)
|
||||
|
||||
target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
target_link_libraries(
|
||||
libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES}
|
||||
)
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#include "local_client.h"
|
||||
|
||||
#include "local_server_interface.h"
|
||||
#include "../../server/local/local_server_interface.h"
|
||||
|
||||
#include <libcockatrice/protocol/pb/session_commands.pb.h>
|
||||
#include <libcockatrice/server/debug_pb_message.h>
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
#ifndef LOCALCLIENT_H
|
||||
#define LOCALCLIENT_H
|
||||
|
||||
#include "abstract_client.h"
|
||||
#include "../abstract_client.h"
|
||||
|
||||
#include <QLoggingCategory>
|
||||
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
set(HEADERS
|
||||
local_client.h
|
||||
)
|
||||
|
||||
set(SOURCES
|
||||
local_client.cpp
|
||||
)
|
||||
|
||||
if (Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif (Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif ()
|
||||
|
||||
add_library(
|
||||
libcockatrice_network_client_local STATIC
|
||||
${MOC_SOURCES}
|
||||
${SOURCES}
|
||||
)
|
||||
|
||||
# add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper)
|
||||
|
||||
target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
target_link_libraries(
|
||||
libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES}
|
||||
)
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#include "remote_client.h"
|
||||
|
||||
#include "../../main.h"
|
||||
#include "../pending_command.h"
|
||||
#include "../../../../cockatrice/src/main.h"
|
||||
#include "../../../../cockatrice/src/server/pending_command.h"
|
||||
#include "version_string.h"
|
||||
|
||||
#include <QCryptographicHash>
|
||||
31
libcockatrice_network/libcockatrice/server/CMakeLists.txt
Normal file
31
libcockatrice_network/libcockatrice/server/CMakeLists.txt
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
set(HEADERS
|
||||
local_client.h
|
||||
)
|
||||
|
||||
set(SOURCES
|
||||
local_client.cpp
|
||||
)
|
||||
|
||||
if (Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif (Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif ()
|
||||
|
||||
add_library(
|
||||
libcockatrice_network_client_local STATIC
|
||||
${MOC_SOURCES}
|
||||
${SOURCES}
|
||||
)
|
||||
|
||||
# add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper)
|
||||
|
||||
target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
target_link_libraries(
|
||||
libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES}
|
||||
)
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
set(HEADERS
|
||||
local_client.h
|
||||
)
|
||||
|
||||
set(SOURCES
|
||||
local_client.cpp
|
||||
)
|
||||
|
||||
if (Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif (Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif ()
|
||||
|
||||
add_library(
|
||||
libcockatrice_network_client_local STATIC
|
||||
${MOC_SOURCES}
|
||||
${SOURCES}
|
||||
)
|
||||
|
||||
# add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper)
|
||||
|
||||
target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
target_link_libraries(
|
||||
libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES}
|
||||
)
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
#include "local_server.h"
|
||||
#include "../../../cockatrice/src/server/local_server.h"
|
||||
|
||||
#include "local_server_interface.h"
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
#include "local_server_interface.h"
|
||||
#include "../../../cockatrice/src/server/local_server_interface.h"
|
||||
|
||||
#include "local_server.h"
|
||||
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
set(HEADERS
|
||||
local_client.h
|
||||
)
|
||||
|
||||
set(SOURCES
|
||||
local_client.cpp
|
||||
)
|
||||
|
||||
if (Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
elseif (Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
|
||||
endif ()
|
||||
|
||||
add_library(
|
||||
libcockatrice_network_client_local STATIC
|
||||
${MOC_SOURCES}
|
||||
${SOURCES}
|
||||
)
|
||||
|
||||
# add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper)
|
||||
|
||||
target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
target_link_libraries(
|
||||
libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES}
|
||||
)
|
||||
Loading…
Add table
Add a link
Reference in a new issue