diff -r b8fa9171be6e -r c82a86ea87be src/main.h --- a/src/main.h Mon Jun 01 17:06:13 2015 +0300 +++ b/src/main.h Fri Jun 05 18:33:51 2015 +0300 @@ -1,6 +1,6 @@ /* * ZCinema: Zandronum demo launcher - * Copyright (C) 2013 Santeri Piippo + * Copyright (C) 2013-2015 Teemu Piippo * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,33 +16,28 @@ * along with this program. If not, see . */ -#ifndef ZCINEMA_MAIN_H -#define ZCINEMA_MAIN_H - +#pragma once #define APPNAME "ZCinema" #define UNIXNAME "zcinema" -#define VERSION_MAJOR 0 -#define VERSION_MINOR 1 +#define VERSION_MAJOR 1 +#define VERSION_MINOR 0 #define VERSION_PATCH 0 -#define BUILD_ID BUILD_BETA -#define RC_ID 0 +// #define IS_RELEASE + +#define MACRO_TO_STRING(A) MACRO_TO_STRING_(A) +#define MACRO_TO_STRING_(A) #A -#define BUILD_INTERNAL 0 -#define BUILD_ALPHA 1 -#define BUILD_BETA 2 -#define BUILD_RC 3 -#define BUILD_RELEASE 4 - -#define elif(A) else if (A) -#define alias auto& +#if VERSION_PATCH == 0 +# define VERSION_STRING MACRO_TO_STRING (VERSION_MAJOR) \ + "." MACRO_TO_STRING (VERSION_MINOR) +#else +# define VERSION_STRING MACRO_TO_STRING (VERSION_MAJOR) \ + "." MACRO_TO_STRING (VERSION_MINOR) \ + "." MACRO_TO_STRING (VERSION_PATCH) +#endif #include #include "cfg.h" -struct VersionInfo; -static const std::nullptr_t null = nullptr; - QString versionString(); -QString versionSignature(); - -#endif // ZCINEMA_MAIN_H \ No newline at end of file +QString versionSignature(); \ No newline at end of file