games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-26 03:52:01 +02:00
Code Issues Releases Activity

- fixed RPATH in cmake

Browse Source 
- minor fixes
This commit is contained in:
Ivan Savenko 2012-10-08 15:21:59 +00:00
parent db10f512d5
commit fcc66b7bb9
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -64,8 +64,12 @@ add_definitions(-DM_DATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_DIR}")
add_definitions(-DM_BIN_DIR="${CMAKE_INSTALL_PREFIX}/${BIN_DIR}") add_definitions(-DM_BIN_DIR="${CMAKE_INSTALL_PREFIX}/${BIN_DIR}")
add_definitions(-DM_LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}") add_definitions(-DM_LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}")
if (CMAKE_INSTALL_RPATH) # if RPATH is not empty - add separator for one more entry
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}:")
endif()
# remain full RPATH when installing (needed to find shared libraries) # remain full RPATH when installing (needed to find shared libraries)
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/vcmi") SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/vcmi")
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
add_subdirectory(lib) add_subdirectory(lib)

2
Mods/WoG/filesystem.json
View File

@ -29,7 +29,7 @@
], ],
"MAPS/": "MAPS/":
[ [
{"type" : "dir", "path" : "ALL/Maps"} {"type" : "dir", "path" : "ALL/MODS/WOG/Maps"}
], ],
} }
} }

1
lib/CModHandler.cpp
View File

@ -128,6 +128,7 @@ CCreature * CModHandler::loadCreature (const JsonNode &node)
cre->fightValue = node["fightValue"].Float(); cre->fightValue = node["fightValue"].Float();
cre->AIValue = node["aiValue"].Float(); cre->AIValue = node["aiValue"].Float();
cre->growth = node["growth"].Float(); cre->growth = node["growth"].Float();
cre->hordeGrowth = node["horde"].Float(); // Needed at least until configurable buildings
cre->addBonus(node["hitPoints"].Float(), Bonus::STACK_HEALTH); cre->addBonus(node["hitPoints"].Float(), Bonus::STACK_HEALTH);
cre->addBonus(node["speed"].Float(), Bonus::STACKS_SPEED); cre->addBonus(node["speed"].Float(), Bonus::STACKS_SPEED);