mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 10:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Core] Updated build defintions. Thanks lfxgroove

Browse source
This commit is contained in:
Antz 2014-10-12 22:17:00 +01:00 • committed by Antz
parent 86690df496
commit 8d61f83e7c
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/Level0.cpp
View file

@ -103,9 +103,9 @@ bool ChatHandler::HandleServerInfoCommand(char* /*args*/)
char const* full;
if (m_session)
full = _FULLVERSION(REVISION_DATE, REVISION_TIME, REVISION_NR, "|cffffffff|Hurl:" REVISION_ID "|h" REVISION_ID "|h|r");
full = MANGOS_FULLVERSION(REVISION_DATE, REVISION_TIME, REVISION_NR, "|cffffffff|Hurl:" REVISION_ID "|h" REVISION_ID "|h|r");
else
full = _FULLVERSION(REVISION_DATE, REVISION_TIME, REVISION_NR, REVISION_ID);
full = MANGOS_FULLVERSION(REVISION_DATE, REVISION_TIME, REVISION_NR, REVISION_ID);
SendSysMessage(full);
if (sScriptMgr.IsScriptLibraryLoaded())

4
src/mangosd/Main.cpp
View file

@ -109,7 +109,7 @@ extern int main(int argc, char** argv)
cfg_file = cmd_opts.opt_arg();
break;
case 'v':
printf("%s\n", _FULLVERSION(REVISION_DATE, REVISION_TIME, REVISION_NR, REVISION_ID));
printf("%s\n", MANGOS_FULLVERSION(REVISION_DATE, REVISION_TIME, REVISION_NR, REVISION_ID));
return 0;
case 's':
{
@ -184,7 +184,7 @@ extern int main(int argc, char** argv)
}
#endif
sLog.outString("%s [world-daemon]", _FULLVERSION(REVISION_DATE, REVISION_TIME, REVISION_NR, REVISION_ID));
sLog.outString("%s [world-daemon]", MANGOS_FULLVERSION(REVISION_DATE, REVISION_TIME, REVISION_NR, REVISION_ID));
sLog.outString("<Ctrl-C> to stop.\n"
" __ __ _ _ ___ ___ ___ \n"
" | \\/ |__ _| \\| |/ __|/ _ \\/ __| \n"

8
src/realmd/Main.cpp
View file

@ -95,7 +95,7 @@ void usage(const char* prog)
extern int main(int argc, char** argv)
{
///- Command line parsing
char const* cfg_file = _REALMD_CONFIG;
char const* cfg_file = REALMD_CONFIG_LOCATION;
char const* options = ":c:s:";
@ -113,7 +113,7 @@ extern int main(int argc, char** argv)
cfg_file = cmd_opts.opt_arg();
break;
case 'v':
printf("%s\n", _FULLVERSION(REVISION_DATE, REVISION_TIME, REVISION_NR, REVISION_ID));
printf("%s\n", MANGOS_FULLVERSION(REVISION_DATE, REVISION_TIME, REVISION_NR, REVISION_ID));
return 0;
case 's':
@ -191,13 +191,13 @@ extern int main(int argc, char** argv)
sLog.Initialize();
sLog.outString("%s [realm-daemon]", _FULLVERSION(REVISION_DATE, REVISION_TIME, REVISION_NR, REVISION_ID));
sLog.outString("%s [realm-daemon]", MANGOS_FULLVERSION(REVISION_DATE, REVISION_TIME, REVISION_NR, REVISION_ID));
sLog.outString("<Ctrl-C> to stop.\n");
sLog.outString("Using configuration file %s.", cfg_file);
///- Check the version of the configuration file
uint32 confVersion = sConfig.GetIntDefault("ConfVersion", 0);
if (confVersion < _REALMDCONFVERSION)
if (confVersion < REALMD_CONFIG_VERSION)
{
sLog.outError("*****************************************************************************");
sLog.outError(" WARNING: Your realmd.conf version indicates your conf file is out of date!");

10
src/shared/SystemConfig.h.in
View file

@ -44,8 +44,8 @@
#ifndef _MANGOSDCONFVERSION
# define _MANGOSDCONFVERSION 2013122901
#endif
#ifndef _REALMDCONFVERSION
# define _REALMDCONFVERSION 2010062001
#ifndef REALMD_CONFIG_VERSION
# define REALMD_CONFIG_VERSION 2010062001
#endif
#if MANGOS_ENDIAN == MANGOS_BIGENDIAN
@ -76,7 +76,7 @@
# define _ENDIAN_PLATFORM "Win32 (" _ENDIAN_STRING ")"
# endif
# define _MANGOSD_CONFIG SYSCONFDIR"mangosd.conf"
# define _REALMD_CONFIG SYSCONFDIR"realmd.conf"
# define REALMD_CONFIG_LOCATION SYSCONFDIR"realmd.conf"
# define _AUCTIONHOUSEBOT_CONFIG SYSCONFDIR"ahbot.conf"
#else
# if defined (__FreeBSD__)
@ -95,11 +95,11 @@
# define _ENDIAN_PLATFORM "Unix_" ARCHITECTURE " (" _ENDIAN_STRING ")"
# endif
# define _MANGOSD_CONFIG SYSCONFDIR"mangosd.conf"
# define _REALMD_CONFIG SYSCONFDIR"realmd.conf"
# define REALMD_CONFIG_LOCATION SYSCONFDIR"realmd.conf"
# define _AUCTIONHOUSEBOT_CONFIG SYSCONFDIR"ahbot.conf"
#endif
#define _FULLVERSION(REVD,REVT,REVN,REVH) _PACKAGENAME "/" _VERSION(REVD,REVT,REVN,REVH) " for " _ENDIAN_PLATFORM
#define MANGOS_FULLVERSION(REVD,REVT,REVN,REVH) _PACKAGENAME "/" _VERSION(REVD,REVT,REVN,REVH) " for " _ENDIAN_PLATFORM
#define DEFAULT_PLAYER_LIMIT 100
#define DEFAULT_WORLDSERVER_PORT 8085 //8129