1e3fb6c6e1
* main.cpp: removed path checking and db loading * card database: merge card loading methods into a single one * settings cache: take care of returning safe paths for decks, replays, etc.. * main window: if db loading fails (eg. first run), propose to run oracle NSIS: propose to run cockatrice instead of oracle Rework card database loading * Move carddatabase-related method out of deckeditor tab * Load cards in another thread and render them progressively * Optimize database reload after enabled sets change Fix deck editor column width * removed the noCard hack. * getCard() no more creates cards instead of just returning existing ones * Fix the “edit tokens” dialog. * PictureLoader: avoid trying to download twice the same card * PictureLoader: correct return of card background * AbstractCardItem: avoid recalculating card color at every paint Use a different file to save custom tokens Misc required improvements * Use nullptr; * Refactor CardInfoWidget to use CardInfoPicture and CardInfoText instead of duplicating code; * Added CardInfo::getColorChar() * Fixed some potential crashes * removed dead code related to CardInfoWidget * Don't require a restart after adding a new custom sets file * Bump CMake requirements to 3.1
51 lines
1.1 KiB
CMake
51 lines
1.1 KiB
CMake
# CMakeLists for common directory
|
|
#
|
|
# provides the common library
|
|
|
|
add_subdirectory(pb)
|
|
|
|
SET(common_SOURCES
|
|
decklist.cpp
|
|
featureset.cpp
|
|
get_pb_extension.cpp
|
|
rng_abstract.cpp
|
|
rng_sfmt.cpp
|
|
server.cpp
|
|
server_abstractuserinterface.cpp
|
|
server_arrow.cpp
|
|
server_arrowtarget.h
|
|
server_card.cpp
|
|
server_cardzone.cpp
|
|
server_counter.cpp
|
|
server_game.cpp
|
|
server_database_interface.cpp
|
|
server_player.cpp
|
|
server_protocolhandler.cpp
|
|
server_remoteuserinterface.cpp
|
|
server_response_containers.cpp
|
|
server_room.cpp
|
|
serverinfo_user_container.cpp
|
|
sfmt/SFMT.c
|
|
)
|
|
|
|
set(ORACLE_LIBS)
|
|
|
|
# Qt4 stuff
|
|
if(Qt4_FOUND)
|
|
# Include directories
|
|
INCLUDE(${QT_USE_FILE})
|
|
include_directories(${QT_INCLUDES})
|
|
endif()
|
|
|
|
# qt5 stuff
|
|
if(Qt5Widgets_FOUND)
|
|
include_directories(${Qt5Widgets_INCLUDE_DIRS})
|
|
endif()
|
|
|
|
INCLUDE_DIRECTORIES(pb)
|
|
INCLUDE_DIRECTORIES(sfmt)
|
|
INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
|
|
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
|
|
|
|
add_library(cockatrice_common ${common_SOURCES} ${common_MOC_SRCS})
|
|
target_link_libraries(cockatrice_common cockatrice_protocol)
|