diff options
| author | Martin Burnicki <martin.burnicki@meinberg.de> | 2023-02-24 13:17:16 +0100 |
|---|---|---|
| committer | Martin Burnicki <martin.burnicki@meinberg.de> | 2023-02-24 13:17:16 +0100 |
| commit | 0bcbf3aaae60e07777f843d52c286f0bbde42443 (patch) | |
| tree | bfc8fb7f3bf2ab4ebd39836cb1fdaa8531f44eab | |
| parent | b3a1c7019617ba4e63056995e182a4dd6c95034f (diff) | |
| download | mbgtools-win-devel.tar.gz mbgtools-win-devel.zip | |
Remove obsolete Windows-specific definitions from mbgversion.h4.2.21-devel-2023-02-24devel
| -rw-r--r-- | mbgversion.h | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/mbgversion.h b/mbgversion.h index d1a7306..e28836e 100644 --- a/mbgversion.h +++ b/mbgversion.h @@ -1,7 +1,7 @@ /************************************************************************** * - * $Id: mbgversion.h 1.24 2023/02/20 16:26:02Z martin.burnicki REL_M $ + * $Id: mbgversion.h 1.25 2023/02/24 12:04:51Z martin.burnicki REL_M $ * * Copyright (c) Meinberg Funkuhren, Bad Pyrmont, Germany * @@ -10,7 +10,9 @@ * * ----------------------------------------------------------------------- * $Log: mbgversion.h $ - * Revision 1.24 2023/02/20 16:26:02Z martin.burnicki + * Revision 1.25 2023/02/24 12:04:51Z martin.burnicki + * Removed Windows-specific definitions which are obsolete. + * Revision 1.24 2023/02/20 16:26:02 martin.burnicki * Changed copyright year to 2023. * Revision 1.23 2022/07/25 16:42:07Z martin.burnicki * Support getting full version string from git. @@ -77,10 +79,6 @@ #define MBG_MINOR_VERSION_CODE 2 #define MBG_MICRO_VERSION_CODE 21 -#if defined( MBG_TGT_WIN32 ) - #define MBG_BUILD_VERSION_CODE 0 -#endif - // -------------------------------------------------------------------- // The following definitions are derived from the definitions above. @@ -92,20 +90,13 @@ #define MBG_MINOR_VERSION_STR STRINGIFY( MBG_MINOR_VERSION_CODE ) #define MBG_MICRO_VERSION_STR STRINGIFY( MBG_MICRO_VERSION_CODE ) -#if defined( MBG_BUILD_VERSION_CODE ) - #define MBG_BUILD_VERSION_STR STRINGIFY( MBG_BUILD_VERSION_CODE ) -#endif - - #define MBG_SHORT_VERSION_CODE ( ( MBG_MAJOR_VERSION_CODE << 8 ) | MBG_MINOR_VERSION_CODE ) #define MBG_SHORT_VERSION_STR MBG_MAJOR_VERSION_STR "." MBG_MINOR_VERSION_STR -#if defined( MBG_BUILD_VERSION_STR ) - #define MBG_NUMERIC_VERSION_STR MBG_SHORT_VERSION_STR "." MBG_MICRO_VERSION_STR "." MBG_BUILD_VERSION_STR -#else - #define MBG_NUMERIC_VERSION_STR MBG_SHORT_VERSION_STR "." MBG_MICRO_VERSION_STR -#endif +#define MBG_NUMERIC_VERSION_STR MBG_SHORT_VERSION_STR "." MBG_MICRO_VERSION_STR +// If a version string has been derived from the git repo, +// we use that one preferably. #if defined( MBG_VERSION_FROM_GIT ) #define MBG_FULL_VERSION_STR STRINGIFY( MBG_VERSION_FROM_GIT ) #else |