Take version number from Cmake file. This way the number is only in one place

This commit is contained in:
Twan van Laarhoven
2020-04-25 23:36:00 +02:00
parent 190d9c8ffa
commit b5f18ebec7
4 changed files with 26 additions and 7 deletions
+15
View File
@@ -0,0 +1,15 @@
//+----------------------------------------------------------------------------+
//| Description: Magic Set Editor - Program to make Magic (tm) cards |
//| Copyright: (C) 2001 - 2017 Twan van Laarhoven and Sean Hunt |
//| License: GNU General Public License 2 or later (see file COPYING) |
//+----------------------------------------------------------------------------+
#pragma once
#define MSE_VERSION_MAJOR @magicseteditor_VERSION_MAJOR@
#define MSE_VERSION_MINOR @magicseteditor_VERSION_MINOR@
#define MSE_VERSION_PATCH @magicseteditor_VERSION_PATCH@
// version number for .rc file
#define MSE_VERSION_RESOURCE @magicseteditor_VERSION_MAJOR@,@magicseteditor_VERSION_MINOR@,@magicseteditor_VERSION_PATCH@,0
#define MSE_VERSION_STRING "@magicseteditor_VERSION_MAJOR@.@magicseteditor_VERSION_MINOR@.@magicseteditor_VERSION_PATCH@"
+3 -2
View File
@@ -9,6 +9,7 @@
#include <util/prec.hpp>
#include <util/version.hpp>
#include <util/reflect.hpp>
#include <config.hpp>
// ----------------------------------------------------------------------------- : Version
@@ -50,7 +51,7 @@ template <> void GetDefaultMember::handle(const Version& v) {
// ----------------------------------------------------------------------------- : Versions
// NOTE: Don't use leading zeroes, they mean octal
const Version app_version = 20000; // 2.0.0
const Version app_version = 10000 * MSE_VERSION_MAJOR + 100 * MSE_VERSION_MINOR + MSE_VERSION_PATCH;
#ifdef UNICODE
const Char* version_suffix = _("");
#else
@@ -82,7 +83,7 @@ const Char* version_suffix = _(" (ascii build)");
* 0.3.9 : bugfix release mostly, a few new script functions
* 2.0.0 : bugfix release mostly, added error console
*/
const Version file_version_locale = 20000; // 2.0.0
const Version file_version_locale = 20002; // 2.0.2
const Version file_version_set = 308; // 0.3.8
const Version file_version_game = 308; // 0.3.8
const Version file_version_stylesheet = 308; // 0.3.8