server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #37 from H0zen/develop21

Browse Source 
[Build] Minor corrections to the build system.
This commit is contained in:
Antz 2015-08-20 22:59:04 +01:00
commit a5ffdf9cc5
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -72,9 +72,9 @@ message(
PLAYERBOTS Enable Player Bots
To set an option simply type -D<OPTION>=<VALUE> after 'cmake <srcs>'.
Also, you can specify the generator with -G. see 'cmake --help' for more details
For example: cmake .. -DDEBUG=1 -DCMAKE_INSTALL_PREFIX=/opt/mangos"
For example: cmake .. -DDEBUG=1 -DCMAKE_INSTALL_PREFIX=/opt/mangos
Note: On UNIX systems, CONF_DIR is relative to the bin folder.
Note: On UNIX systems, CONF_DIR is relative to the bin folder."
)
message("")

8
cmake/FindGit.cmake
View File

@ -35,12 +35,8 @@ endif()
find_program(GIT_EXECUTABLE
NAMES ${git_names}
PATHS
"$ENV{ProgramFiles}/Git/bin"
"$ENV{ProgramFiles(x86)}/Git/bin"
"$ENV{PATH}"
"/usr/bin"
"/usr/local/bin"
HINTS
ENV PATH
DOC "git command line client"
)
mark_as_advanced(GIT_EXECUTABLE)

4
src/game/WorldHandlers/PoolManager.cpp
View File

@ -1028,7 +1028,9 @@ void PoolManager::LoadFromDB()
{
PoolTemplateData& pPoolTemplate = mPoolTemplate[pool_entry];
pPoolTemplate.MaxLimit = 0;
pPoolTemplate.description = "autopool zone %u" ,pool_entry ;
std::ostringstream sZone;
sZone << "autopool zone " << pool_entry;
pPoolTemplate.description = sZone.str();
pPoolTemplate.AutoSpawn = true; // will update and later data loading
}