diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2004-09-17 19:57:01 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2004-09-17 19:57:01 (GMT) |
| commit | bedb6e899f28b6dc2f16c093342e9a34dd9bc46b (patch) | |
| tree | d10a3a64c26654ccc793ebda07d1314353e262b4 /Source/cmLocalVisualStudio6Generator.cxx | |
| parent | 239cec12e086a27b77a5082192a0d4c1da762e70 (diff) | |
| download | CMake-bedb6e899f28b6dc2f16c093342e9a34dd9bc46b.zip CMake-bedb6e899f28b6dc2f16c093342e9a34dd9bc46b.tar.gz CMake-bedb6e899f28b6dc2f16c093342e9a34dd9bc46b.tar.bz2 | |
BUG: fix for bug 1041, _MBCS sometimes added for UNIICODE which is bad
Diffstat (limited to 'Source/cmLocalVisualStudio6Generator.cxx')
| -rw-r--r-- | Source/cmLocalVisualStudio6Generator.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx index beb5889..0360e5a 100644 --- a/Source/cmLocalVisualStudio6Generator.cxx +++ b/Source/cmLocalVisualStudio6Generator.cxx @@ -1086,7 +1086,9 @@ void cmLocalVisualStudio6Generator::WriteDSPHeader(std::ostream& fout, const cha flags = m_Makefile->GetRequiredDefinition("CMAKE_C_FLAGS"); } // 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\""; } |