diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-04-10 23:08:19 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-04-20 12:14:34 +0200 |
| commit | 99529fb80dd4914807d89dafc82087da7b4c26c2 (patch) | |
| tree | a62fd6650bf56b511f746dfb5c766868cf032cfb /core | |
| parent | 22b9c0207bf3a50bcc0db6df8af5ec2d8631abcc (diff) | |
Move VERSION_MKSTRING logic to version.h
Fixes a bug where the VERSION_PATCH define is not yet in scope if
typedefs.h is included before version.h at compilation time.
(cherry picked from commit 3b687c5474113b64f186388883ca85cdfe6523d4)
Diffstat (limited to 'core')
| -rw-r--r-- | core/class_db.cpp | 1 | ||||
| -rw-r--r-- | core/typedefs.h | 11 | ||||
| -rw-r--r-- | core/version.h | 37 |
3 files changed, 38 insertions, 11 deletions
diff --git a/core/class_db.cpp b/core/class_db.cpp index 94a907a1f0..0ca982303d 100644 --- a/core/class_db.cpp +++ b/core/class_db.cpp @@ -30,6 +30,7 @@ #include "class_db.h" #include "os/mutex.h" +#include "version.h" #ifdef NO_THREADS diff --git a/core/typedefs.h b/core/typedefs.h index 335f576bce..40d9ea37b5 100644 --- a/core/typedefs.h +++ b/core/typedefs.h @@ -42,17 +42,6 @@ #define _MKSTR(m_x) _STR(m_x) #endif -/** - * Version macros - it is necessary to include "version.h" for those to work. - * Include it in the .cpp file, not the header. - */ -#ifdef VERSION_PATCH -#define VERSION_MKSTRING "" _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) "." _MKSTR(VERSION_PATCH) "." _MKSTR(VERSION_STATUS) "." _MKSTR(VERSION_REVISION) -#else -#define VERSION_MKSTRING "" _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) "." _MKSTR(VERSION_STATUS) "." _MKSTR(VERSION_REVISION) -#endif // VERSION_PATCH -#define VERSION_FULL_NAME "" _MKSTR(VERSION_NAME) " v" VERSION_MKSTRING - #ifndef _ALWAYS_INLINE_ #if defined(__GNUC__) && (__GNUC__ >= 4) diff --git a/core/version.h b/core/version.h new file mode 100644 index 0000000000..80e50e51b9 --- /dev/null +++ b/core/version.h @@ -0,0 +1,37 @@ +/*************************************************************************/ +/* version.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md) */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ +#include "version_generated.h" + +#ifdef VERSION_PATCH +#define VERSION_MKSTRING "" _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) "." _MKSTR(VERSION_PATCH) "." _MKSTR(VERSION_STATUS) "." _MKSTR(VERSION_REVISION) +#else +#define VERSION_MKSTRING "" _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) "." _MKSTR(VERSION_STATUS) "." _MKSTR(VERSION_REVISION) +#endif // VERSION_PATCH +#define VERSION_FULL_NAME "" _MKSTR(VERSION_NAME) " v" VERSION_MKSTRING |