mirror of
https://github.com/vcmi/vcmi.git
synced 2024-11-24 08:32:34 +02:00
0b70baa95e
* Indirect spell effects loading * Json serializer improvements * spell->canBeCastAt do not allow useless cast for any spell * Added proxy caster class for spell-created obstacles * Handle damage from spell-created obstacles inside mechanics * Experimental GameState integration/regression tests * Ignore mod settings and load only "vcmi" mod when running tests * fixed https://bugs.vcmi.eu/view.php?id=2765 (with tests) * Huge improvements of BattleAI regarding spell casts * AI can cast almost any combat spell except TELEPORT, SACRIFICE and obstacle placement spells. * Possible fix for https://bugs.vcmi.eu/view.php?id=1811 * CStack factored out to several classes * [Battle] Allowed RETURN_AFTER_STRIKE effect on server side to be optional * [Battle] Allowed BattleAction have multiple destinations * [Spells] Converted limit|immunity to target condition * [Spells] Use partial configuration reload for backward compatibility handling * [Tests] Started tests for CUnitState * Partial fixes of fire shield effect * [Battle] Do HP calculations in 64 bits * [BattleAI] Use threading for spell cast evaluation * [BattleAI] Made AI be able to evaluate modified turn order (on hypothetical battle state) * Implemented https://bugs.vcmi.eu/view.php?id=2811 * plug rare freeze when hypnotized unit shots vertically * Correctly apply ONLY_MELEE_FIGHT / ONLY_DISTANCE_FIGHT for unit damage, attack & defense * [BattleAI] Try to not waste a cast if battle is actually won already * Extended JsonSerializeFormat API * fixed https://bugs.vcmi.eu/view.php?id=2847 * Any unit effect can be now chained (not only damage like Chain Lightning) ** only damage effect for now actually uses "chainFactor" * Possible quick fix for https://bugs.vcmi.eu/view.php?id=2860
171 lines
4.6 KiB
CMake
171 lines
4.6 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
|
|
|
|
CBitmapHandler.cpp
|
|
CreatureCostBox.cpp
|
|
CGameInfo.cpp
|
|
Client.cpp
|
|
CMessage.cpp
|
|
CMT.cpp
|
|
CMusicHandler.cpp
|
|
CPlayerInterface.cpp
|
|
CPreGame.cpp
|
|
CVideoHandler.cpp
|
|
Graphics.cpp
|
|
mapHandler.cpp
|
|
NetPacksClient.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
|
|
|
|
CBitmapHandler.h
|
|
CreatureCostBox.h
|
|
CGameInfo.h
|
|
Client.h
|
|
CMessage.h
|
|
CMT.h
|
|
CMusicHandler.h
|
|
CPlayerInterface.h
|
|
CPreGame.h
|
|
CVideoHandler.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()
|