piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2578 from Armada651/cmake-stable

Browse Source 
Don't display the branch name in the titlebar for the stable branch.
This commit is contained in:
Jules Blok
2015-06-09 22:28:54 +02:00
parent 5fe2924af6 35aa676fe7
commit 97e3c5302d
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Common/make_scmrev.h.js
View File

@ -65,7 +65,7 @@ var gitexe = GetGitExe();
var revision = GetFirstStdOutLine(gitexe + cmd_revision);
var describe = GetFirstStdOutLine(gitexe + cmd_describe);
var branch = GetFirstStdOutLine(gitexe + cmd_branch);
var isMaster = +("master" == branch);
var isStable = +("master" == branch || "stable" == branch);
// remove hash (and trailing "-0" if needed) from description
describe = describe.replace(/(-0)?-[^-]+(-dirty)?$/, '$2');
@ -74,7 +74,7 @@ var out_contents =
"#define SCM_REV_STR \"" + revision + "\"\n" +
"#define SCM_DESC_STR \"" + describe + "\"\n" +
"#define SCM_BRANCH_STR \"" + branch + "\"\n" +
"#define SCM_IS_MASTER " + isMaster + "\n";
"#define SCM_IS_MASTER " + isStable + "\n";
// check if file needs updating
if (out_contents == GetFileContents(outfile))