mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-14 22:42:14 -07:00
Move abstract client.
Took 2 minutes
This commit is contained in:
parent
4e7c98829a
commit
5414e3e3b5
33 changed files with 64 additions and 33 deletions
|
|
@ -3,11 +3,11 @@ set(CMAKE_AUTOUIC ON)
|
|||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
set(HEADERS
|
||||
local_client.h
|
||||
abstract/abstract_client.h
|
||||
)
|
||||
|
||||
set(SOURCES
|
||||
local_client.cpp
|
||||
abstract/abstract_client.cpp
|
||||
)
|
||||
|
||||
if (Qt6_FOUND)
|
||||
|
|
@ -17,7 +17,7 @@ elseif (Qt5_FOUND)
|
|||
endif ()
|
||||
|
||||
add_library(
|
||||
libcockatrice_network_client_local STATIC
|
||||
libcockatrice_network_client STATIC
|
||||
${MOC_SOURCES}
|
||||
${SOURCES}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -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 "../../../cockatrice/src/server/abstract_client.h"
|
||||
|
||||
#include "../../../cockatrice/src/server/pending_command.h"
|
||||
#include "../../../../cockatrice/src/server/pending_command.h"
|
||||
|
||||
#include <google/protobuf/descriptor.h>
|
||||
#include <libcockatrice/protocol/pb/commands.pb.h>
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
#ifndef LOCALCLIENT_H
|
||||
#define LOCALCLIENT_H
|
||||
|
||||
#include "../abstract_client.h"
|
||||
#include "../abstract/abstract_client.h"
|
||||
|
||||
#include <QLoggingCategory>
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
#ifndef REMOTECLIENT_H
|
||||
#define REMOTECLIENT_H
|
||||
|
||||
#include "../abstract_client.h"
|
||||
#include "../abstract/abstract_client.h"
|
||||
|
||||
#include <QLoggingCategory>
|
||||
#include <QTcpSocket>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue