Move version stuff back to the standard include.
This commit is contained in:
parent
df2a542377
commit
7974bd5cd0
@ -1,5 +1,4 @@
|
||||
#include "STDInclude.hpp"
|
||||
#include "..\..\Utils\Versioning.hpp"
|
||||
|
||||
namespace Components
|
||||
{
|
||||
|
@ -1,5 +1,4 @@
|
||||
#include "STDInclude.hpp"
|
||||
#include "..\..\Utils\Versioning.hpp"
|
||||
|
||||
// Stuff causes warnings
|
||||
#pragma warning(push)
|
||||
|
@ -1,5 +1,4 @@
|
||||
#include "STDInclude.hpp"
|
||||
#include "..\..\Utils\Versioning.hpp"
|
||||
|
||||
namespace Components
|
||||
{
|
||||
|
@ -1,5 +1,4 @@
|
||||
#include "STDInclude.hpp"
|
||||
#include "..\..\Utils\Versioning.hpp"
|
||||
|
||||
namespace Components
|
||||
{
|
||||
|
@ -1,5 +1,4 @@
|
||||
#include "STDInclude.hpp"
|
||||
#include "..\..\Utils\Versioning.hpp"
|
||||
|
||||
namespace Components
|
||||
{
|
||||
|
@ -1,5 +1,4 @@
|
||||
#include "STDInclude.hpp"
|
||||
#include "..\..\Utils\Versioning.hpp"
|
||||
|
||||
namespace Components
|
||||
{
|
||||
|
@ -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
|
||||
|
@ -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
|
Loading…
Reference in New Issue
Block a user