Update version correctly again (#6462)

* Update version correctly again
Partial revert of PR 6331

* It doesn't update automatically

diff --git a/src/config.h b/src/config.h
index 5882b4e217f983fccc873704c8624c41bba6af40..039100914499464da3cb7a80294eafdc443f17d9 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -5,6 +5,10 @@
 
 #pragma once
 
+#define STRINGIFY(x) #x
+#define STR(x) STRINGIFY(x)
+
+
 #if defined USE_CMAKE_CONFIG_H
        #include "cmake_config.h"
 #elif defined (__ANDROID__) || defined (ANDROID)
@@ -24,3 +28,13 @@
                #define BUILD_TYPE "Debug"
        #endif
 #endif
+
+#define BUILD_INFO \
+       "BUILD_TYPE=" BUILD_TYPE "\n"          \
+       "RUN_IN_PLACE=" STR(RUN_IN_PLACE) "\n" \
+       "USE_GETTEXT=" STR(USE_GETTEXT) "\n"   \
+       "USE_SOUND=" STR(USE_SOUND) "\n"       \
+       "USE_CURL=" STR(USE_CURL) "\n"         \
+       "USE_FREETYPE=" STR(USE_FREETYPE) "\n" \
+       "USE_LUAJIT=" STR(USE_LUAJIT) "\n"     \
+       "STATIC_SHAREDIR=" STR(STATIC_SHAREDIR);

diff --git a/src/version.cpp b/src/version.cpp
index 9887efdb11c903484aac9e27b6e9d30e7587f6eb..c0c59ee99f089c23bae257614c2777fcfd056a95 100644 (file)
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -31,20 +31,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        #define VERSION_GITHASH VERSION_STRING
 #endif
 
-#define STRINGIFY(x) #x
-#define STR(x) STRINGIFY(x)
-
 const char *g_version_string = VERSION_STRING;
 const char *g_version_hash = VERSION_GITHASH;
-const char *g_build_info =
-#ifdef __STDC__
-       "Build date: " __DATE__ " " __TIME__ "\n"
-#endif
-       "BUILD_TYPE=" BUILD_TYPE "\n"
-       "RUN_IN_PLACE=" STR(RUN_IN_PLACE) "\n"
-       "USE_GETTEXT=" STR(USE_GETTEXT) "\n"
-       "USE_SOUND=" STR(USE_SOUND) "\n"
-       "USE_CURL=" STR(USE_CURL) "\n"
-       "USE_FREETYPE=" STR(USE_FREETYPE) "\n"
-       "USE_LUAJIT=" STR(USE_LUAJIT) "\n"
-       "STATIC_SHAREDIR=" STR(STATIC_SHAREDIR);
+const char *g_build_info = BUILD_INFO;