diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2011-08-21 16:30:19 -0500 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2011-08-21 17:43:05 -0500 |
| commit | e8fe15c3f7e3471f49ea0423ac0fe652db90391a (patch) | |
| tree | 5cdd0d71d7981941ddeb786ab8c98ceba763fc59 /Source/Core/Common | |
| parent | 95fd6e925cb3113cc3bde93c4aa56f4e1cabbfaa (diff) | |
Make titlebar and about dialog fancy for cmake build.
Windows needs fixing.
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/Src/Common.h | 2 | ||||
| -rw-r--r-- | Source/Core/Common/Src/Version.cpp | 22 |
2 files changed, 15 insertions, 9 deletions
diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h index 7618f5329b..bc9b4dc051 100644 --- a/Source/Core/Common/Src/Common.h +++ b/Source/Core/Common/Src/Common.h @@ -26,7 +26,7 @@ #include <string.h> // SVN version number -extern const char *svn_rev_str; +extern const char *scm_rev_str; extern const char *netplay_dolphin_ver; // Force enable logging in the right modes. For some reason, something had changed diff --git a/Source/Core/Common/Src/Version.cpp b/Source/Core/Common/Src/Version.cpp index 4f2f0b1d77..f3d30398c8 100644 --- a/Source/Core/Common/Src/Version.cpp +++ b/Source/Core/Common/Src/Version.cpp @@ -16,15 +16,21 @@ // http://code.google.com/p/dolphin-emu/ #include "Common.h" -#include "svnrev.h" +#include "scmrev.h" #ifdef _DEBUG -const char *svn_rev_str = "Dolphin Debug r" SVN_REV_STR; + #define BUILD_TYPE_STR "Debug " #elif defined DEBUGFAST -const char *svn_rev_str = "Dolphin Debugfast r" SVN_REV_STR; + #define BUILD_TYPE_STR "DebugFast " #else -const char *svn_rev_str = "Dolphin r" SVN_REV_STR; -#endif + #define BUILD_TYPE_STR "" +#endif + +const char *scm_rev_str = "Dolphin " +#if !SCM_IS_MASTER + "[" SCM_BRANCH_STR "] " +#endif + BUILD_TYPE_STR SCM_DESC_STR; #ifdef _M_X64 #define NP_ARCH "x64" @@ -33,9 +39,9 @@ const char *svn_rev_str = "Dolphin r" SVN_REV_STR; #endif #ifdef _WIN32 -const char *netplay_dolphin_ver = SVN_REV_STR " W" NP_ARCH; +const char *netplay_dolphin_ver = SCM_DESC_STR " W" NP_ARCH; #elif __APPLE__ -const char *netplay_dolphin_ver = SVN_REV_STR " M" NP_ARCH; +const char *netplay_dolphin_ver = SCM_DESC_STR " M" NP_ARCH; #else -const char *netplay_dolphin_ver = SVN_REV_STR " L" NP_ARCH; +const char *netplay_dolphin_ver = SCM_DESC_STR " L" NP_ARCH; #endif |