Ninja: no /nologo option in old rc.exe

This commit is contained in:
Peter Kuemmel 2012-06-15 12:47:40 +02:00
parent 2fb07fc44c
commit bf58e9adec
1 changed files with 2 additions and 3 deletions

View File

@ -683,11 +683,10 @@ int main() {
srcfilename = srcfile.substr(pos + 1); srcfilename = srcfile.substr(pos + 1);
} }
std::string nol = " /nologo ";
std::string show = " /showIncludes "; std::string show = " /showIncludes ";
if (lang == "C" || lang == "CXX") { if (lang == "C" || lang == "CXX") {
return process(srcfilename, dfile, objfile, prefix, return process(srcfilename, dfile, objfile, prefix,
binpath + nol + show + rest); binpath + show + rest);
} else if (lang == "RC") { } else if (lang == "RC") {
// "misuse" cl.exe to get headers from .rc files // "misuse" cl.exe to get headers from .rc files
@ -702,7 +701,7 @@ int main() {
// extract dependencies with cl.exe // extract dependencies with cl.exe
process(srcfilename, dfile, objfile, process(srcfilename, dfile, objfile,
prefix, cl + nol + show + clrest, true); prefix, cl + show + clrest, true);
// compile rc file with rc.exe // compile rc file with rc.exe
return process(srcfilename, "" , objfile, prefix, binpath + nol + rest); return process(srcfilename, "" , objfile, prefix, binpath + nol + rest);