aboutsummaryrefslogtreecommitdiff
path: root/src/shared/SystemConfig.h.in
diff options
context:
space:
mode:
Diffstat (limited to 'src/shared/SystemConfig.h.in')
-rw-r--r--src/shared/SystemConfig.h.in46
1 files changed, 0 insertions, 46 deletions
diff --git a/src/shared/SystemConfig.h.in b/src/shared/SystemConfig.h.in
index 571ff23519e..262aa9e6355 100644
--- a/src/shared/SystemConfig.h.in
+++ b/src/shared/SystemConfig.h.in
@@ -26,54 +26,8 @@
#include "Platform/Define.h"
-<<<<<<< HEAD:src/shared/SystemConfig.h.in
// THIS IS TEMP :)
#define _FULLVERSION "Trinity"
-=======
-#ifndef _VERSION
-#if PLATFORM == PLATFORM_WINDOWS
-# define _VERSION(REVD,REVT,REVN,REVH) "0.13.0-DEV" " (" REVD " " REVT " Revision " REVN " - " REVH ")"
-#else
-# define _VERSION(REVD,REVT,REVN,REVH) "@VERSION@" " (" REVD " " REVT " Revision " REVN " - " REVH ")"
-#endif
-#endif
-
-// Format is YYYYMMDDRR where RR is the change in the conf file
-// for that day.
-#ifndef _MANGOSDCONFVERSION
-# define _MANGOSDCONFVERSION 2008022901
-#endif
-#ifndef _REALMDCONFVERSION
-# define _REALMDCONFVERSION 2007062001
-#endif
-
-#if MANGOS_ENDIAN == MANGOS_BIGENDIAN
-# define _ENDIAN_STRING "big-endian"
-#else
-# define _ENDIAN_STRING "little-endian"
-#endif
-
-// The path to config files
-#ifndef SYSCONFDIR
-# define SYSCONFDIR ""
-#endif
-
-#if PLATFORM == PLATFORM_WINDOWS
-# ifdef _WIN64
-# define _ENDIAN_PLATFORM "Win64 (" _ENDIAN_STRING ")"
-# else
-# define _ENDIAN_PLATFORM "Win32 (" _ENDIAN_STRING ")"
-# endif
-# define _MANGOSD_CONFIG SYSCONFDIR"mangosd.conf"
-# define _REALMD_CONFIG SYSCONFDIR"realmd.conf"
-#else
-# define _ENDIAN_PLATFORM "Unix (" _ENDIAN_STRING ")"
-# define _MANGOSD_CONFIG SYSCONFDIR"mangosd.conf"
-# define _REALMD_CONFIG SYSCONFDIR"realmd.conf"
-#endif
-
-#define _FULLVERSION(REVD,REVT,REVN,REVH) _PACKAGENAME "/" _VERSION(REVD,REVT,REVN,REVH) " for " _ENDIAN_PLATFORM
->>>>>>> upstream/master:src/shared/SystemConfig.h.in
#define DEFAULT_PLAYER_LIMIT 100
#define DEFAULT_WORLDSERVER_PORT 8085 //8129