Merge pull request #76001 from pkowal1982/version

Fix Windows StringFileInfo structure
This commit is contained in:
Rémi Verschelde 2023-04-13 09:56:17 +02:00
commit 1a90031f3c
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 6 additions and 6 deletions

View File

@ -40,13 +40,13 @@
// Defines the main "branch" version. Patch versions in this branch should be // Defines the main "branch" version. Patch versions in this branch should be
// forward-compatible. // forward-compatible.
// Example: "3.1" // Example: "3.1"
#define VERSION_BRANCH "" _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) #define VERSION_BRANCH _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR)
#if VERSION_PATCH #if VERSION_PATCH
// Example: "3.1.4" // Example: "3.1.4"
#define VERSION_NUMBER "" VERSION_BRANCH "." _MKSTR(VERSION_PATCH) #define VERSION_NUMBER VERSION_BRANCH "." _MKSTR(VERSION_PATCH)
#else // patch is 0, we don't include it in the "pretty" version number. #else // patch is 0, we don't include it in the "pretty" version number.
// Example: "3.1" instead of "3.1.0" // Example: "3.1" instead of "3.1.0"
#define VERSION_NUMBER "" VERSION_BRANCH #define VERSION_NUMBER VERSION_BRANCH
#endif // VERSION_PATCH #endif // VERSION_PATCH
// Version number encoded as hexadecimal int with one byte for each number, // Version number encoded as hexadecimal int with one byte for each number,
@ -57,16 +57,16 @@
// Describes the full configuration of that Godot version, including the version number, // Describes the full configuration of that Godot version, including the version number,
// the status (beta, stable, etc.) and potential module-specific features (e.g. mono). // the status (beta, stable, etc.) and potential module-specific features (e.g. mono).
// Example: "3.1.4.stable.mono" // Example: "3.1.4.stable.mono"
#define VERSION_FULL_CONFIG "" VERSION_NUMBER "." VERSION_STATUS VERSION_MODULE_CONFIG #define VERSION_FULL_CONFIG VERSION_NUMBER "." VERSION_STATUS VERSION_MODULE_CONFIG
// Similar to VERSION_FULL_CONFIG, but also includes the (potentially custom) VERSION_BUILD // Similar to VERSION_FULL_CONFIG, but also includes the (potentially custom) VERSION_BUILD
// description (e.g. official, custom_build, etc.). // description (e.g. official, custom_build, etc.).
// Example: "3.1.4.stable.mono.official" // Example: "3.1.4.stable.mono.official"
#define VERSION_FULL_BUILD "" VERSION_FULL_CONFIG "." VERSION_BUILD #define VERSION_FULL_BUILD VERSION_FULL_CONFIG "." VERSION_BUILD
// Same as above, but prepended with Godot's name and a cosmetic "v" for "version". // Same as above, but prepended with Godot's name and a cosmetic "v" for "version".
// Example: "Godot v3.1.4.stable.official.mono" // Example: "Godot v3.1.4.stable.official.mono"
#define VERSION_FULL_NAME "" VERSION_NAME " v" VERSION_FULL_BUILD #define VERSION_FULL_NAME VERSION_NAME " v" VERSION_FULL_BUILD
// Git commit hash, generated at build time in `core/version_hash.gen.cpp`. // Git commit hash, generated at build time in `core/version_hash.gen.cpp`.
extern const char *const VERSION_HASH; extern const char *const VERSION_HASH;