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

Merge pull request #49 from H0zen/develop21

Browse Source 
[Core] More minor fixes for worldserver startup/shutdown on *nix
This commit is contained in:
Antz 2015-11-12 20:34:25 +00:00
commit 627ab06eb6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mangosd/CMakeLists.txt
View File

@ -140,9 +140,9 @@ set(EXECUTABLE_LINK_FLAGS "")
if(UNIX)
if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
set(EXECUTABLE_LINK_FLAGS "-Wl,--no-as-needed -pthread -lrt ${EXECUTABLE_LINK_FLAGS} -rdynamic")
set(EXECUTABLE_LINK_FLAGS "-Wl,--no-as-needed -pthread -lrt ${EXECUTABLE_LINK_FLAGS}")
elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
set(EXECUTABLE_LINK_FLAGS "-Wl,--no-as-needed -ldl -pthread -lrt ${EXECUTABLE_LINK_FLAGS} -rdynamic")
set(EXECUTABLE_LINK_FLAGS "-Wl,--no-as-needed -ldl -pthread -lrt ${EXECUTABLE_LINK_FLAGS}")
endif()
endif()

4
src/mangosd/Comm/CliRunnable.cpp
View File

@ -576,7 +576,7 @@ bool ChatHandler::HandleServerLogLevelCommand(char* args)
/// @}
#ifdef linux
#if (PLATFORM == PLATFORM_APPLE) || (PLATFORM == PLATFORM_UNIX)
// Non-blocking keypress detector, when return pressed, return 1, else always return 0
int kb_hit_return()
{
@ -613,7 +613,7 @@ void CliRunnable::run()
while (!World::IsStopped())
{
fflush(stdout);
#ifdef linux
#if (PLATFORM == PLATFORM_APPLE) || (PLATFORM == PLATFORM_UNIX)
while (!kb_hit_return() && !World::IsStopped())
// With this, we limit CLI to 10commands/second
{ usleep(100); }