Merge pull request #87579 from akien-mga/3.x-year-2024
[3.x] Update `year` property in `version.py` to 2024
This commit is contained in:
commit
e184e626f7
4 changed files with 13 additions and 13 deletions
|
@ -33,6 +33,12 @@
|
|||
|
||||
#include "core/version_generated.gen.h"
|
||||
|
||||
// Copied from typedefs.h to stay lean.
|
||||
#ifndef _STR
|
||||
#define _STR(m_x) #m_x
|
||||
#define _MKSTR(m_x) _STR(m_x)
|
||||
#endif
|
||||
|
||||
// Godot versions are of the form <major>.<minor> for the initial release,
|
||||
// and then <major>.<minor>.<patch> for subsequent bugfix releases where <patch> != 0
|
||||
// That's arbitrary, but we find it pretty and it's the current policy.
|
||||
|
|
|
@ -1,8 +1,4 @@
|
|||
#include "core/version.h"
|
||||
#ifndef _STR
|
||||
#define _STR(m_x) #m_x
|
||||
#define _MKSTR(m_x) _STR(m_x)
|
||||
#endif
|
||||
|
||||
GODOT_ICON ICON platform/windows/godot.ico
|
||||
|
||||
|
@ -21,7 +17,7 @@ BEGIN
|
|||
VALUE "FileVersion", VERSION_NUMBER
|
||||
VALUE "ProductName", VERSION_NAME
|
||||
VALUE "Licence", "MIT"
|
||||
VALUE "LegalCopyright", "Copyright (c) 2007-" _MKSTR(VERSION_YEAR) " Juan Linietsky, Ariel Manzur and contributors"
|
||||
VALUE "LegalCopyright", "(c) 2007-present Juan Linietsky, Ariel Manzur and Godot Engine contributors"
|
||||
VALUE "Info", "https://godotengine.org"
|
||||
VALUE "ProductVersion", VERSION_FULL_BUILD
|
||||
END
|
||||
|
|
4
thirdparty/miniupnpc/src/miniupnpcstrings.h
vendored
4
thirdparty/miniupnpc/src/miniupnpcstrings.h
vendored
|
@ -1,9 +1,7 @@
|
|||
#ifndef MINIUPNPCSTRINGS_H_INCLUDED
|
||||
#define MINIUPNPCSTRINGS_H_INCLUDED
|
||||
|
||||
#include "core/version.h"
|
||||
|
||||
#define OS_STRING VERSION_NAME "/1.0"
|
||||
#define OS_STRING "Godot Engine/1.0"
|
||||
#define MINIUPNPC_VERSION_STRING "2.2.5"
|
||||
|
||||
#if 0
|
||||
|
|
|
@ -5,6 +5,6 @@ minor = 6
|
|||
patch = 0
|
||||
status = "beta"
|
||||
module_config = ""
|
||||
year = 2022
|
||||
year = 2024
|
||||
website = "https://godotengine.org"
|
||||
docs = "3.5"
|
||||
|
|
Loading…
Reference in a new issue