diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2009-11-19 11:15:46 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2009-11-19 11:17:04 +0100 |
| commit | 1f7cc171ac1264d8ecfcac6aa83e8aec42059adc (patch) | |
| tree | 91f24c995c681c5aaaa023deb450936aae395c1d /main/enigma.cpp | |
| parent | 7a81c7d2707f237d6aee01a945028e63baf5662c (diff) | |
| download | enigma2-1f7cc171ac1264d8ecfcac6aa83e8aec42059adc.tar.gz enigma2-1f7cc171ac1264d8ecfcac6aa83e8aec42059adc.zip | |
main/enigma.cpp: use new defines for getEnigmaVersionString
Diffstat (limited to 'main/enigma.cpp')
| -rw-r--r-- | main/enigma.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
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) |