summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsfan5 <sfan5@live.de>2020-04-25 15:24:42 +0200
committersfan5 <sfan5@live.de>2020-04-27 17:50:05 +0200
commit13a8ea2dac2217cc898c7fc62c448f4ff6998d46 (patch)
tree9bb0a0f3b786a30cbf57fbf6943f2daad367c569
parent91c4f7f0ea0b653d15bfabc05f5474f8fa1a8806 (diff)
downloadminetest-13a8ea2dac2217cc898c7fc62c448f4ff6998d46.tar.gz
minetest-13a8ea2dac2217cc898c7fc62c448f4ff6998d46.tar.bz2
minetest-13a8ea2dac2217cc898c7fc62c448f4ff6998d46.zip
Add STATIC_LOCALEDIR to BUILD_INFO and move it to version.cpp
-rw-r--r--src/config.h10
-rw-r--r--src/version.cpp14
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
+;