From: ghost <andreas.monzner@multimedia-labs.de>
Date: Thu, 19 Nov 2009 10:15:46 +0000 (+0100)
Subject: main/enigma.cpp: use new defines for getEnigmaVersionString
X-Git-Tag: 2.6.1~3
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/db4f0e854904431a0499a6827f6f3703725c2987

main/enigma.cpp: use new defines for getEnigmaVersionString
---

diff --git a/main/enigma.cpp b/main/enigma.cpp
index be9d9a53..b5523d31 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -309,14 +309,21 @@ void quitMainloop(int exitCode)
 
 const char *getEnigmaVersionString()
 {
-	return 
-#ifdef ENIGMA2_CHECKOUT_TAG
-		ENIGMA2_CHECKOUT_TAG
+	std::string date =
+#ifdef ENIGMA2_LAST_CHANGE_DATE
+		ENIGMA2_LAST_CHANGE_DATE;
+#else
+		__DATE__;
+#endif
+	std::string branch =
+#ifdef ENIGMA2_BRANCH
+		ENIGMA2_BRANCH;
 #else
 		"HEAD"
 #endif
-			"-" __DATE__;
+	return std::string(date + '-' + branch).c_str();
 }
+
 #include <malloc.h>
 
 void dump_malloc_stats(void)