Source/cmVisualStudio10TargetGenerator.cxx | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 1e37ca5..9dfcc65 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -422,15 +422,15 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues()
       {
       this->WriteString("<CharacterSet>Unicode</CharacterSet>\n", 2);
       }
-    else if (this->Target->GetType() <= cmTarget::MODULE_LIBRARY &&
-       this->ClOptions[*i]->UsingSBCS())
+    else /*if (this->Target->GetType() <= cmTarget::MODULE_LIBRARY &&
+       this->ClOptions[*i]->UsingSBCS()) */
       {
       this->WriteString("<CharacterSet>NotSet</CharacterSet>\n", 2);
       }
-    else
+    /*else
       {
       this->WriteString("<CharacterSet>MultiByte</CharacterSet>\n", 2);
-      }
+      }*/
     if(const char* toolset = gg->GetPlatformToolset())
       {
       std::string pts = "<PlatformToolset>";
@@ -1228,6 +1228,7 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
   // Get preprocessor definitions for this directory.
   std::string defineFlags = this->Target->GetMakefile()->GetDefineFlags();
   clOptions.FixExceptionHandlingDefault();
+  clOptions.AddFlag("RuntimeLibrary", "");
   clOptions.AddFlag("PrecompiledHeader", "NotUsing");
   clOptions.Parse(flags.c_str());
   clOptions.Parse(defineFlags.c_str());
@@ -1419,10 +1420,10 @@ void cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const&
     {
     flags += " /SUBSYSTEM:WINDOWS";
     }
-  else
+  /* else
     {
     flags += " /SUBSYSTEM:CONSOLE";
-    }
+    } */
   cmSystemTools::ReplaceString(flags, "/INCREMENTAL:YES", "");
   cmSystemTools::ReplaceString(flags, "/INCREMENTAL:NO", "");
   std::string standardLibsVar = "CMAKE_";
@@ -1514,6 +1515,8 @@ void cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const&

   linkOptions.AddFlag("ImportLibrary", imLib.c_str());
   linkOptions.AddFlag("ProgramDataBaseFile", pdb.c_str());
+  linkOptions.AddFlag("RandomizedBaseAddress", "");
+  linkOptions.AddFlag("DataExecutionPrevention", "");
   linkOptions.Parse(flags.c_str());
   if(!this->GeneratorTarget->ModuleDefinitionFile.empty())
     {