diff options
| author | megamage <none@none> | 2009-01-18 17:58:13 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-01-18 17:58:13 -0600 |
| commit | c85c89dc0b0564113e48bfcaf96dc2af55d73bb8 (patch) | |
| tree | b75e19414c6a9dc8bfd438f9e0c7a2e42aada9a6 /src/shared | |
| parent | 54ed3974138f2f51c3c42c4469f9f1541818f631 (diff) | |
| parent | 613217fca7c2959fe3abbe593f4be65beedaeca8 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/Database/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/shared/SystemConfig.h | 10 | ||||
| -rw-r--r-- | src/shared/revision.h | 7 | ||||
| -rw-r--r-- | src/shared/revision.h.in | 4 |
4 files changed, 12 insertions, 10 deletions
diff --git a/src/shared/Database/CMakeLists.txt b/src/shared/Database/CMakeLists.txt index a819a66dec7..78cc48436e7 100644 --- a/src/shared/Database/CMakeLists.txt +++ b/src/shared/Database/CMakeLists.txt @@ -13,7 +13,6 @@ SET(trinitydatabase_STAT_SRCS DatabasePostgre.h DatabaseSqlite.cpp DatabaseSqlite.h -#Brian likes men Field.cpp Field.h MySQLDelayThread.h diff --git a/src/shared/SystemConfig.h b/src/shared/SystemConfig.h index aeb38891c11..9e7fe3e3045 100644 --- a/src/shared/SystemConfig.h +++ b/src/shared/SystemConfig.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> * * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> @@ -25,7 +25,7 @@ #define TRINITY_SYSTEMCONFIG_H #include "Platform/Define.h" -#include "revision.h" //-----here u are ------ _REVISION is the magic key +#include "revision.h" #define _PACKAGENAME "TrinityCore " @@ -39,12 +39,12 @@ #if PLATFORM == PLATFORM_WINDOWS # ifdef _WIN64 -# define _FULLVERSION _PACKAGENAME "Rev: " _REVISION " (Win64," _ENDIAN_STRING ")" +# define _FULLVERSION _PACKAGENAME "Rev: " _REVISION " Hash: " _HASH " (Win64," _ENDIAN_STRING ")" # else -# define _FULLVERSION _PACKAGENAME "Rev: " _REVISION " (Win32," _ENDIAN_STRING ")" +# define _FULLVERSION _PACKAGENAME "Rev: " _REVISION " Hash: " _HASH " (Win32," _ENDIAN_STRING ")" # endif #else -# define _FULLVERSION _PACKAGENAME "Rev: " _REVISION " (Unix," _ENDIAN_STRING ")" +# define _FULLVERSION _PACKAGENAME "Rev: " _REVISION " Hash: " _HASH " (Unix," _ENDIAN_STRING ")" #endif #define DEFAULT_PLAYER_LIMIT 100 diff --git a/src/shared/revision.h b/src/shared/revision.h new file mode 100644 index 00000000000..e2fa39e47fd --- /dev/null +++ b/src/shared/revision.h @@ -0,0 +1,7 @@ +#ifndef __REVISION_H__ +#define __REVISION_H__ + #define _REVISION "1008" + #define _HASH "30a554889aa4" + #define _REVISION_DATE "*" + #define _REVISION_TIME "*" +#endif // __REVISION_H__ diff --git a/src/shared/revision.h.in b/src/shared/revision.h.in deleted file mode 100644 index a84170529eb..00000000000 --- a/src/shared/revision.h.in +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef __SVN_REVISION_H__ -#define __SVN_REVISION_H__ - #define _REVISION "794" //change this to your current revision -#endif // __SVN_REVISION_H__ |