From 7974bd5cd030ae9aaf863c433ce2cf4b4b9d000f Mon Sep 17 00:00:00 2001
From: momo5502 <mauriceheumann@gmail.com>
Date: Sat, 9 Jan 2016 15:59:18 +0100
Subject: [PATCH] Move version stuff back to the standard include.

---
 src/Components/Modules/Console.cpp    |  1 -
 src/Components/Modules/Exception.cpp  |  1 -
 src/Components/Modules/Party.cpp      |  1 -
 src/Components/Modules/QuickPatch.cpp |  1 -
 src/Components/Modules/ServerInfo.cpp |  1 -
 src/Components/Modules/ServerList.cpp |  1 -
 src/STDInclude.hpp                    | 13 +++++++++++++
 src/Utils/Versioning.hpp              | 11 -----------
 8 files changed, 13 insertions(+), 17 deletions(-)
 delete mode 100644 src/Utils/Versioning.hpp

diff --git a/src/Components/Modules/Console.cpp b/src/Components/Modules/Console.cpp
index 99d68f99..86ab5d0e 100644
--- a/src/Components/Modules/Console.cpp
+++ b/src/Components/Modules/Console.cpp
@@ -1,5 +1,4 @@
 #include "STDInclude.hpp"
-#include "..\..\Utils\Versioning.hpp"
 
 namespace Components
 {
diff --git a/src/Components/Modules/Exception.cpp b/src/Components/Modules/Exception.cpp
index c5b823d1..a31cc833 100644
--- a/src/Components/Modules/Exception.cpp
+++ b/src/Components/Modules/Exception.cpp
@@ -1,5 +1,4 @@
 #include "STDInclude.hpp"
-#include "..\..\Utils\Versioning.hpp"
 
 // Stuff causes warnings
 #pragma warning(push)
diff --git a/src/Components/Modules/Party.cpp b/src/Components/Modules/Party.cpp
index 7b03f297..31cd11c9 100644
--- a/src/Components/Modules/Party.cpp
+++ b/src/Components/Modules/Party.cpp
@@ -1,5 +1,4 @@
 #include "STDInclude.hpp"
-#include "..\..\Utils\Versioning.hpp"
 
 namespace Components
 {
diff --git a/src/Components/Modules/QuickPatch.cpp b/src/Components/Modules/QuickPatch.cpp
index 9663ee02..385278cc 100644
--- a/src/Components/Modules/QuickPatch.cpp
+++ b/src/Components/Modules/QuickPatch.cpp
@@ -1,5 +1,4 @@
 #include "STDInclude.hpp"
-#include "..\..\Utils\Versioning.hpp"
 
 namespace Components
 {
diff --git a/src/Components/Modules/ServerInfo.cpp b/src/Components/Modules/ServerInfo.cpp
index e68b83f4..f951c9f2 100644
--- a/src/Components/Modules/ServerInfo.cpp
+++ b/src/Components/Modules/ServerInfo.cpp
@@ -1,5 +1,4 @@
 #include "STDInclude.hpp"
-#include "..\..\Utils\Versioning.hpp"
 
 namespace Components
 {
diff --git a/src/Components/Modules/ServerList.cpp b/src/Components/Modules/ServerList.cpp
index 2baca7c2..855ece83 100644
--- a/src/Components/Modules/ServerList.cpp
+++ b/src/Components/Modules/ServerList.cpp
@@ -1,5 +1,4 @@
 #include "STDInclude.hpp"
-#include "..\..\Utils\Versioning.hpp"
 
 namespace Components
 {
diff --git a/src/STDInclude.hpp b/src/STDInclude.hpp
index f69d7de2..377c17fd 100644
--- a/src/STDInclude.hpp
+++ b/src/STDInclude.hpp
@@ -32,6 +32,9 @@
 #include <zlib.h>
 #include <json11.hpp>
 
+// Version number
+#include <version.hpp>
+
 #include "Utils\CSV.hpp"
 #include "Utils\Utils.hpp"
 #include "Utils\WebIO.hpp"
@@ -51,3 +54,13 @@
 #pragma comment(lib, "Winmm.lib")
 #pragma comment(lib, "Crypt32.lib")
 #pragma comment(lib, "Ws2_32.lib")
+
+// Revision number
+#define STRINGIZE_(x) #x
+#define STRINGIZE(x) STRINGIZE_(x)
+
+#define MILESTONE "alpha"
+
+#define REVISION_STR STRINGIZE(REVISION)
+#define VERSION 4,2,REVISION
+#define VERSION_STR "4.2." REVISION_STR
diff --git a/src/Utils/Versioning.hpp b/src/Utils/Versioning.hpp
deleted file mode 100644
index 836c0d24..00000000
--- a/src/Utils/Versioning.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <version.hpp>
-
-// Revision number
-#define STRINGIZE_(x) #x
-#define STRINGIZE(x) STRINGIZE_(x)
-
-#define MILESTONE "alpha"
-
-#define REVISION_STR STRINGIZE(REVISION)
-#define VERSION 4,2,REVISION
-#define VERSION_STR "4.2." REVISION_STR