Commit df19b9ca authored by David Cole's avatar David Cole

VS6: Avoid _MBCS define when _SBCS is defined (#12189)

Should fix the failing SBCS test on the VS6 dashboard.
parent ba89e92b
......@@ -1605,11 +1605,13 @@ void cmLocalVisualStudio6Generator
flagsDebugRel = this->Makefile->GetSafeDefinition(flagVar.c_str());
flagsDebugRel += " -DCMAKE_INTDIR=\\\"RelWithDebInfo\\\" ";
}
// if unicode is not found, then add -D_MBCS
// if _UNICODE and _SBCS are not found, then add -D_MBCS
std::string defs = this->Makefile->GetDefineFlags();
if(flags.find("D_UNICODE") == flags.npos &&
defs.find("D_UNICODE") == flags.npos)
defs.find("D_UNICODE") == flags.npos &&
flags.find("D_SBCS") == flags.npos &&
defs.find("D_SBCS") == flags.npos)
{
flags += " /D \"_MBCS\"";
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment