BUG: fix for bug 1041, _MBCS sometimes added for UNIICODE which is bad
This commit is contained in:
parent
239cec12e0
commit
bedb6e899f
|
@ -1086,7 +1086,9 @@ void cmLocalVisualStudio6Generator::WriteDSPHeader(std::ostream& fout, const cha
|
||||||
flags = m_Makefile->GetRequiredDefinition("CMAKE_C_FLAGS");
|
flags = m_Makefile->GetRequiredDefinition("CMAKE_C_FLAGS");
|
||||||
}
|
}
|
||||||
// if unicode is not found, then add -D_MBCS
|
// if unicode is not found, then add -D_MBCS
|
||||||
if(flags.find("D_UNICODE") == flags.npos)
|
std::string defs = m_Makefile->GetDefineFlags();
|
||||||
|
if(flags.find("D_UNICODE") == flags.npos &&
|
||||||
|
defs.find("D_UNICODE") == flags.npos)
|
||||||
{
|
{
|
||||||
flags += " /D \"_MBCS\"";
|
flags += " /D \"_MBCS\"";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue