games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/develop' into parellel_rmg

Browse Source 
# Conflicts:
#	lib/rmg/modificators/WaterProxy.cpp
This commit is contained in:
Tomasz Zieliński
2023-05-20 11:59:39 +02:00
parent 15b254fded cb4cf224a9
commit 67c0fbc240
228 changed files with 6837 additions and 4417 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake_modules/VCMI_lib.cmake
+1 -1
View File
@@ -361,7 +361,7 @@ macro(add_main_lib TARGET_NAME LIBRARY_TYPE)
${MAIN_LIB_DIR}/mapObjects/CArmedInstance.h
${MAIN_LIB_DIR}/mapObjects/CBank.h
${MAIN_LIB_DIR}/mapObjects/CGDwelling.cpp
${MAIN_LIB_DIR}/mapObjects/CGDwelling.h
${MAIN_LIB_DIR}/mapObjects/CGHeroInstance.h
${MAIN_LIB_DIR}/mapObjects/CGMarket.h
${MAIN_LIB_DIR}/mapObjects/CGPandoraBox.h