Add STATIC_LOCALEDIR to BUILD_INFO and move it to version.cpp

minetest · Apr 27, 2020 · 13a8ea2 · 13a8ea2
1 parent 91c4f7f
commit 13a8ea2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git 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
@@ -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
+;