From bedb6e899f28b6dc2f16c093342e9a34dd9bc46b Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Fri, 17 Sep 2004 15:57:01 -0400
Subject: BUG: fix for bug 1041, _MBCS sometimes added for UNIICODE which is
 bad

---
 Source/cmLocalVisualStudio6Generator.cxx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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\"";
       }
-- 
cgit v0.12