From 13a8ea2dac2217cc898c7fc62c448f4ff6998d46 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sat, 25 Apr 2020 15:24:42 +0200 Subject: [PATCH] Add STATIC_LOCALEDIR to BUILD_INFO and move it to version.cpp --- src/config.h | 10 ---------- src/version.cpp | 14 +++++++++++++- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/config.h b/src/config.h index 9d58a8cc1..5e1164642 100644 --- a/src/config.h +++ b/src/config.h @@ -28,13 +28,3 @@ #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 ae5ca3412..241228a6a 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -30,4 +30,16 @@ with this program; if not, write to the Free Software Foundation, Inc., const char *g_version_string = VERSION_STRING; const char *g_version_hash = VERSION_GITHASH; -const char *g_build_info = BUILD_INFO; +const char *g_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) +#if USE_GETTEXT && defined(STATIC_LOCALEDIR) + "\n" "STATIC_LOCALEDIR=" STR(STATIC_LOCALEDIR) +#endif +; -- 2.25.1