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:16:45 +0100 |
| commit | db4f0e854904431a0499a6827f6f3703725c2987 (patch) | |
| tree | 1bc48c292a30437b904be5f6d42343edd28466ca /main/enigma.cpp | |
| parent | 9a2525f40543a40fdff44d1dccdc1b55b139291f (diff) | |
| download | enigma2-db4f0e854904431a0499a6827f6f3703725c2987.tar.gz enigma2-db4f0e854904431a0499a6827f6f3703725c2987.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) |