mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-24 22:14:36 +02:00
ac66fc7f42
New features for players: * Loading for multiplayer. Any save could be used for multiplayer. * Restart for multiplayer. All clients will restart together. * Loading from single save. * Hotseat mixed with network game. Multiple players per client. * Now connection to server could be cancelled. * Return to menu on disconnections instead of crashes. * Restoring of last selected map, save or campaign on next run. TLDR on important changes in engine code: * UI: work with server separated from UI * UI: all explitic blitting replaced with IntObject's * UI: all new code use smart pointers instead of DISPOSE * Gameplay always start through lobby controlled by server. * Threads receiving netpacks now shared for lobby and gameplay. * Campaigns: heroes for crossover now serialized as JsonNode.
200 lines
5.3 KiB
CMake
200 lines
5.3 KiB
CMake
include_directories(${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/lib)
|
|
include_directories(${SDL2_INCLUDE_DIR} ${SDL2_IMAGE_INCLUDE_DIR} ${SDL2_MIXER_INCLUDE_DIR} ${SDL2_TTF_INCLUDE_DIR})
|
|
include_directories(${Boost_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${FFMPEG_INCLUDE_DIRS})
|
|
|
|
set(client_SRCS
|
|
StdInc.cpp
|
|
../CCallback.cpp
|
|
|
|
battle/CBattleAnimations.cpp
|
|
battle/CBattleInterfaceClasses.cpp
|
|
battle/CBattleInterface.cpp
|
|
battle/CCreatureAnimation.cpp
|
|
|
|
gui/CAnimation.cpp
|
|
gui/CCursorHandler.cpp
|
|
gui/CGuiHandler.cpp
|
|
gui/CIntObject.cpp
|
|
gui/Fonts.cpp
|
|
gui/Geometries.cpp
|
|
gui/SDL_Extensions.cpp
|
|
|
|
widgets/AdventureMapClasses.cpp
|
|
widgets/Buttons.cpp
|
|
widgets/CArtifactHolder.cpp
|
|
widgets/CComponent.cpp
|
|
widgets/CGarrisonInt.cpp
|
|
widgets/Images.cpp
|
|
widgets/MiscWidgets.cpp
|
|
widgets/ObjectLists.cpp
|
|
widgets/TextControls.cpp
|
|
|
|
windows/CAdvmapInterface.cpp
|
|
windows/CCastleInterface.cpp
|
|
windows/CCreatureWindow.cpp
|
|
windows/CreaturePurchaseCard.cpp
|
|
windows/CHeroWindow.cpp
|
|
windows/CKingdomInterface.cpp
|
|
windows/CQuestLog.cpp
|
|
windows/CSpellWindow.cpp
|
|
windows/CTradeWindow.cpp
|
|
windows/CWindowObject.cpp
|
|
windows/GUIClasses.cpp
|
|
windows/InfoWindows.cpp
|
|
windows/QuickRecruitmentWindow.cpp
|
|
|
|
mainmenu/CMainMenu.cpp
|
|
mainmenu/CCampaignScreen.cpp
|
|
mainmenu/CreditsScreen.cpp
|
|
mainmenu/CPrologEpilogVideo.cpp
|
|
|
|
lobby/CBonusSelection.cpp
|
|
lobby/CSelectionBase.cpp
|
|
lobby/CLobbyScreen.cpp
|
|
lobby/CSavingScreen.cpp
|
|
lobby/CScenarioInfoScreen.cpp
|
|
lobby/OptionsTab.cpp
|
|
lobby/RandomMapTab.cpp
|
|
lobby/SelectionTab.cpp
|
|
|
|
CBitmapHandler.cpp
|
|
CreatureCostBox.cpp
|
|
CGameInfo.cpp
|
|
Client.cpp
|
|
CMessage.cpp
|
|
CMT.cpp
|
|
CMusicHandler.cpp
|
|
CPlayerInterface.cpp
|
|
CVideoHandler.cpp
|
|
CServerHandler.cpp
|
|
Graphics.cpp
|
|
mapHandler.cpp
|
|
NetPacksClient.cpp
|
|
NetPacksLobbyClient.cpp
|
|
SDLRWwrapper.cpp
|
|
)
|
|
|
|
set(client_HEADERS
|
|
StdInc.h
|
|
|
|
battle/CBattleAnimations.h
|
|
battle/CBattleInterfaceClasses.h
|
|
battle/CBattleInterface.h
|
|
battle/CCreatureAnimation.h
|
|
|
|
gui/CAnimation.h
|
|
gui/CCursorHandler.h
|
|
gui/CGuiHandler.h
|
|
gui/CIntObject.h
|
|
gui/Fonts.h
|
|
gui/Geometries.h
|
|
gui/SDL_Compat.h
|
|
gui/SDL_Extensions.h
|
|
gui/SDL_Pixels.h
|
|
|
|
widgets/AdventureMapClasses.h
|
|
widgets/Buttons.h
|
|
widgets/CArtifactHolder.h
|
|
widgets/CComponent.h
|
|
widgets/CGarrisonInt.h
|
|
widgets/Images.h
|
|
widgets/MiscWidgets.h
|
|
widgets/ObjectLists.h
|
|
widgets/TextControls.h
|
|
windows/CAdvmapInterface.h
|
|
windows/CCastleInterface.h
|
|
windows/CCreatureWindow.h
|
|
windows/CreaturePurchaseCard.h
|
|
windows/CHeroWindow.h
|
|
windows/CKingdomInterface.h
|
|
windows/CQuestLog.h
|
|
windows/CSpellWindow.h
|
|
windows/CTradeWindow.h
|
|
windows/CWindowObject.h
|
|
windows/GUIClasses.h
|
|
windows/InfoWindows.h
|
|
windows/QuickRecruitmentWindow.h
|
|
|
|
mainmenu/CMainMenu.h
|
|
mainmenu/CCampaignScreen.h
|
|
mainmenu/CreditsScreen.h
|
|
mainmenu/CPrologEpilogVideo.h
|
|
|
|
lobby/CBonusSelection.h
|
|
lobby/CSelectionBase.h
|
|
lobby/CLobbyScreen.h
|
|
lobby/CSavingScreen.h
|
|
lobby/CScenarioInfoScreen.h
|
|
lobby/OptionsTab.h
|
|
lobby/RandomMapTab.h
|
|
lobby/SelectionTab.h
|
|
|
|
CBitmapHandler.h
|
|
CreatureCostBox.h
|
|
CGameInfo.h
|
|
Client.h
|
|
CMessage.h
|
|
CMT.h
|
|
CMusicHandler.h
|
|
CPlayerInterface.h
|
|
CVideoHandler.h
|
|
CServerHandler.h
|
|
Graphics.h
|
|
mapHandler.h
|
|
resource.h
|
|
SDLMain.h
|
|
SDLRWwrapper.h
|
|
)
|
|
|
|
assign_source_group(${client_SRCS} ${client_HEADERS} VCMI_client.rc)
|
|
|
|
if(ANDROID) # android needs client/server to be libraries, not executables, so we can't reuse the build part of this script
|
|
return()
|
|
endif()
|
|
|
|
if(APPLE)
|
|
set(client_SRCS ${client_SRCS} SDLMain.m)
|
|
elseif(WIN32)
|
|
set(client_ICON "VCMI_client.rc")
|
|
endif()
|
|
|
|
if(ENABLE_DEBUG_CONSOLE)
|
|
add_executable(vcmiclient ${client_SRCS} ${client_HEADERS} ${client_ICON})
|
|
else()
|
|
add_executable(vcmiclient WIN32 ${client_SRCS} ${client_HEADERS} ${client_ICON})
|
|
endif(ENABLE_DEBUG_CONSOLE)
|
|
add_dependencies(vcmiclient vcmiserver BattleAI StupidAI VCAI)
|
|
|
|
if(WIN32)
|
|
set_target_properties(vcmiclient
|
|
PROPERTIES
|
|
OUTPUT_NAME "VCMI_client"
|
|
PROJECT_LABEL "VCMI_client"
|
|
)
|
|
set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT vcmiclient)
|
|
if(NOT ENABLE_DEBUG_CONSOLE)
|
|
target_link_libraries(vcmiclient ${SDLMAIN_LIBRARY})
|
|
endif()
|
|
endif()
|
|
|
|
target_link_libraries(vcmiclient vcmi ${Boost_LIBRARIES}
|
|
${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARY} ${SDL2_MIXER_LIBRARY} ${SDL2_TTF_LIBRARY}
|
|
${ZLIB_LIBRARIES} ${FFMPEG_LIBRARIES} ${FFMPEG_EXTRA_LINKING_OPTIONS} ${SYSTEM_LIBS}
|
|
)
|
|
vcmi_set_output_dir(vcmiclient "")
|
|
|
|
set_target_properties(vcmiclient PROPERTIES ${PCH_PROPERTIES})
|
|
cotire(vcmiclient)
|
|
|
|
install(TARGETS vcmiclient DESTINATION ${BIN_DIR})
|
|
|
|
#install icons and desktop file on Linux
|
|
if(NOT WIN32 AND NOT APPLE)
|
|
#FIXME: move to client makefile?
|
|
install(FILES "${CMAKE_SOURCE_DIR}/client/icons/vcmiclient.64x64.png" DESTINATION share/icons/hicolor/64x64/apps RENAME vcmiclient.png)
|
|
install(FILES "${CMAKE_SOURCE_DIR}/client/icons/vcmiclient.48x48.png" DESTINATION share/icons/hicolor/48x48/apps RENAME vcmiclient.png)
|
|
install(FILES "${CMAKE_SOURCE_DIR}/client/icons/vcmiclient.32x32.png" DESTINATION share/icons/hicolor/32x32/apps RENAME vcmiclient.png)
|
|
install(FILES "${CMAKE_SOURCE_DIR}/client/icons/vcmiclient.256x256.png" DESTINATION share/icons/hicolor/256x256/apps RENAME vcmiclient.png)
|
|
install(FILES "${CMAKE_SOURCE_DIR}/client/icons/vcmiclient.desktop" DESTINATION share/applications)
|
|
endif()
|