citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #32 from yuriks/master 

[build] Search for the git binary in the default msysgit install dir
This commit is contained in:
bunnei 2014-07-21 10:51:51 -04:00
parent f4f505c76c 78eb8ba844
commit 97d47d55f3
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/scm_rev_gen.js
View File

@ -6,8 +6,15 @@ var cmd_revision = " rev-parse HEAD";
var cmd_describe = " describe --always --long --dirty"; var cmd_describe = " describe --always --long --dirty";
var cmd_branch = " rev-parse --abbrev-ref HEAD"; var cmd_branch = " rev-parse --abbrev-ref HEAD";
var git_search_paths = {
"git.cmd": 1,
"git": 1,
"C:\\Program Files (x86)\\Git\\bin\\git.exe": 1,
"C:\\Program Files\\Git\\bin\\git.exe": 1
};
function GetGitExe() { function GetGitExe() {
for (var gitexe in { "git.cmd": 1, "git": 1 }) { for (var gitexe in git_search_paths) {
try { try {
wshShell.Exec(gitexe); wshShell.Exec(gitexe);
return gitexe; return gitexe;