merge

edfda1f9 · Christian Heimes · 47674bc4 · f2f48c56 · edfda1f9 · edfda1f9
Commit edfda1f9 authored Oct 29, 2013 by Christian Heimes
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

PC/VS9.0/x64.vsprops PC/VS9.0/x64.vsprops +1 -1

PCbuild/x64.props PCbuild/x64.props +1 -1

No files found.
--- a/PC/VS9.0/x64.vsprops
+++ b/PC/VS9.0/x64.vsprops
@@ -8,7 +8,7 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalOptions="/USECL:MS_OPTERON /GS-"
+		AdditionalOptions="/GS-"
 		PreprocessorDefinitions="_WIN64;_M_X64"
 	/>
 	<Tool

--- a/PCbuild/x64.props
+++ b/PCbuild/x64.props
@@ -5,7 +5,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
-      <AdditionalOptions>/USECL:MS_OPTERON /GS- %(AdditionalOptions)</AdditionalOptions>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
      <PreprocessorDefinitions>_WIN64;_M_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <Link>