Revert "move version info to version.h, no longer needs full recompile on version change"

This reverts commit b3a2ab735b76185715d7efd848659ef87ca70405.

8 files changed, 72 insertions, 76 deletions

diff --git a/.gitignore b/.gitignore
index 9ac6e38..c7fe9f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,8 +46,6 @@ Makefile.me
 *.project
 *.cproject
 *.settings
-*.cbp
-*.layout
 config.log
 *.sconsign.dblite
 *.sconf_temp
diff --git a/src/Config.h b/src/Config.h
index 1210f6d..06045f8 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -1,3 +1,10 @@
+/*
+ * Config.h
+ *
+ *  Created on: Jan 5, 2012
+ *      Author: Simon
+ */
+
 //#ifndef CONFIG_H_
 //#define CONFIG_H_
 
@@ -10,10 +17,75 @@
 #define PATH_SEP_CHAR '/'
 #endif
 
+//VersionInfoStart
+#ifndef SAVE_VERSION
+#define SAVE_VERSION 85
+#endif
+
+#ifndef MINOR_VERSION
+#define MINOR_VERSION 0
+#endif
+
+#ifndef BUILD_NUM
+#define BUILD_NUM 254
+#endif
+
+#ifndef SNAPSHOT_ID
+#define SNAPSHOT_ID 0
+#endif
+
+#ifndef STABLE
+#ifndef BETA
+#define BETA
+#define SNAPSHOT
+#endif
+#endif
+//VersionInfoEnd
+
+//#define IGNORE_UPDATES //uncomment this for mods, to not get any update notifications
+
 #if defined(DEBUG) || defined(RENDERER) || defined(X86_SSE2)
 #define HIGH_QUALITY_RESAMPLE			//High quality image resampling, slower but much higher quality than my terribad linear interpolation
 #endif
 
+#if defined(SNAPSHOT)
+#define IDENT_RELTYPE "S"
+#elif defined(BETA)
+#define IDENT_RELTYPE "B"
+#else
+#define IDENT_RELTYPE "R"
+#endif
+
+#if defined(WIN)
+#if defined(_64BIT)
+#define IDENT_PLATFORM "WIN64"
+#else
+#define IDENT_PLATFORM "WIN32"
+#endif
+#elif defined(LIN)
+#if defined(_64BIT)
+#define IDENT_PLATFORM "LIN64"
+#else
+#define IDENT_PLATFORM "LIN32"
+#endif
+#elif defined(MACOSX)
+#define IDENT_PLATFORM "MACOSX"
+#else
+#define IDENT_PLATFORM "UNKNOWN"
+#endif
+
+#if defined(X86_SSE3)
+#define IDENT_BUILD "SSE3"
+#elif defined(X86_SSE2)
+#define IDENT_BUILD "SSE2"
+#elif defined(X86_SSE)
+#define IDENT_BUILD "SSE"
+#else
+#define IDENT_BUILD "NO"
+#endif
+
+#define IDENT_VERSION "G" //Change this if you're not Simon! It should be a single letter
+
 #define MTOS_EXPAND(str) #str
 #define MTOS(str) MTOS_EXPAND(str)
 
diff --git a/src/Version.h b/src/Version.h
deleted file mode 100644
index a1b57c4..0000000
--- a/src/Version.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#ifndef VERSION_H
-#define VERSION_H
-
-//VersionInfoStart
-#ifndef SAVE_VERSION
-#define SAVE_VERSION 85
-#endif
-
-#ifndef MINOR_VERSION
-#define MINOR_VERSION 0
-#endif
-
-#ifndef BUILD_NUM
-#define BUILD_NUM 254
-#endif
-
-#ifndef SNAPSHOT_ID
-#define SNAPSHOT_ID 0
-#endif
-
-#ifndef STABLE
-#ifndef BETA
-#define BETA
-#define SNAPSHOT
-#endif
-#endif
-//VersionInfoEnd
-
-//#define IGNORE_UPDATES //uncomment this for mods, to not get any update notifications
-
-#if defined(SNAPSHOT)
-#define IDENT_RELTYPE "S"
-#elif defined(BETA)
-#define IDENT_RELTYPE "B"
-#else
-#define IDENT_RELTYPE "R"
-#endif
-
-#if defined(WIN)
-#if defined(_64BIT)
-#define IDENT_PLATFORM "WIN64"
-#else
-#define IDENT_PLATFORM "WIN32"
-#endif
-#elif defined(LIN)
-#if defined(_64BIT)
-#define IDENT_PLATFORM "LIN64"
-#else
-#define IDENT_PLATFORM "LIN32"
-#endif
-#elif defined(MACOSX)
-#define IDENT_PLATFORM "MACOSX"
-#else
-#define IDENT_PLATFORM "UNKNOWN"
-#endif
-
-#if defined(X86_SSE3)
-#define IDENT_BUILD "SSE3"
-#elif defined(X86_SSE2)
-#define IDENT_BUILD "SSE2"
-#elif defined(X86_SSE)
-#define IDENT_BUILD "SSE"
-#else
-#define IDENT_BUILD "NO"
-#endif
-
-#define IDENT_VERSION "G"
-
-#endif
diff --git a/src/cat/LuaScriptInterface.cpp b/src/cat/LuaScriptInterface.cpp
index 88fe934..cce4920 100644
--- a/src/cat/LuaScriptInterface.cpp
+++ b/src/cat/LuaScriptInterface.cpp
@@ -12,7 +12,6 @@
 #include <locale>
 #include <fstream>
 #include "Config.h"
-#include "Version.h"
 #include "Format.h"
 #include "LuaLuna.h"
 #include "LuaScriptInterface.h"
diff --git a/src/client/Client.cpp b/src/client/Client.cpp
index 5ccabe4..75e01eb 100644
--- a/src/client/Client.cpp
+++ b/src/client/Client.cpp
@@ -26,7 +26,6 @@
 #endif
 
 #include "Config.h"
-#include "Version.h"
 #include "Format.h"
 #include "Client.h"
 #include "MD5.h"
diff --git a/src/client/GameSave.cpp b/src/client/GameSave.cpp
index 0082af5..53736ca 100644
--- a/src/client/GameSave.cpp
+++ b/src/client/GameSave.cpp
@@ -4,7 +4,6 @@
 #include <vector>
 #include <bzlib.h>
 #include "Config.h"
-#include "Version.h"
 #include "Format.h"
 #include "bson/BSON.h"
 #include "GameSave.h"
diff --git a/src/client/HTTP.cpp b/src/client/HTTP.cpp
index 6728258..5fc4d08 100644
--- a/src/client/HTTP.cpp
+++ b/src/client/HTTP.cpp
@@ -49,7 +49,6 @@
 #endif
 
 #include "Config.h"
-#include "Version.h"
 #include "HTTP.h"
 #include "MD5.h"
 
diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp
index 2d4d9a5..a037d05 100644
--- a/src/game/GameView.cpp
+++ b/src/game/GameView.cpp
@@ -2,7 +2,6 @@
 #include <iomanip>
 
 #include "Config.h"
-#include "Version.h"
 #include "Style.h"
 #include "GameView.h"
 #include "graphics/Graphics.h"