From 14acf7178b558f90c88d60bda1c41a9c3fc7d23d Mon Sep 17 00:00:00 2001 From: Barinade Date: Sun, 24 Nov 2019 22:28:16 -0600 Subject: [PATCH] Remove some version variables & rename others --- src/Etterna/verstub.in.cpp | 8 +++----- src/ver.h | 26 ++++++++++++-------------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/src/Etterna/verstub.in.cpp b/src/Etterna/verstub.in.cpp index 33857d0aef..2a0b72ef30 100644 --- a/src/Etterna/verstub.in.cpp +++ b/src/Etterna/verstub.in.cpp @@ -1,6 +1,4 @@ // clang-format off -extern char const* const sm_version_git_hash = "@SM_VERSION_GIT_HASH@"; -extern char const* const version_date = "@SM_TIMESTAMP_DATE@"; -extern char const* const version_time = "@SM_TIMESTAMP_TIME@"; -extern char const* const product_version = "@SM_VERSION_GIT@"; -// clang-format on \ No newline at end of file +extern char const* const version_git_hash = "@PRODUCT_GIT_HASH@"; +extern char const* const product_version = "@PROJECT_VERSION@"; +// clang-format on diff --git a/src/ver.h b/src/ver.h index a244a213c1..e2c11876a5 100644 --- a/src/ver.h +++ b/src/ver.h @@ -1,14 +1,12 @@ -#ifndef STEPMANIA_VER_H -#define STEPMANIA_VER_H - -extern char const* const product_version; - -// XXX: These names are misnomers. This is actually the BUILD number, time and -// date. NOTE: In GNU toolchain these are defined in ver.cpp. In MSVC these are -// defined in archutils/Win32/verinc.c I think. Why? I don't know and I don't -// have MSVC. --root -extern char const* const version_time; -extern char const* const version_date; -extern char const* const sm_version_git_hash; - -#endif \ No newline at end of file +#ifndef STEPMANIA_VER_H +#define STEPMANIA_VER_H + +extern char const* const product_version; + +// XXX: These names are misnomers. This is actually the BUILD number, time and +// date. NOTE: In GNU toolchain these are defined in ver.cpp. In MSVC these are +// defined in archutils/Win32/verinc.c I think. Why? I don't know and I don't +// have MSVC. --root +extern char const* const version_git_hash; + +#endif