From 678616b06823bd302a6528c201b320350bfd227f Mon Sep 17 00:00:00 2001
From: Tom van Dijck <tvandijck@blizzard.com>
Date: Wed, 10 Jun 2015 16:26:51 -0700
Subject: [PATCH] fix for /O2 not liking /RTC1

---
 src/actions/vstudio/vs2010_vcxproj.lua                 | 5 +++--
 tests/actions/vstudio/vc2010/test_compile_settings.lua | 5 -----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/actions/vstudio/vs2010_vcxproj.lua b/src/actions/vstudio/vs2010_vcxproj.lua
index 1622c6fa..262f63ae 100644
--- a/src/actions/vstudio/vs2010_vcxproj.lua
+++ b/src/actions/vstudio/vs2010_vcxproj.lua
@@ -944,7 +944,8 @@
 
 
 	function m.basicRuntimeChecks(cfg)
-		if cfg.flags.NoRuntimeChecks or config.isOptimizedBuild(cfg) then
+		local runtime = config.getruntime(cfg)
+		if cfg.flags.NoRuntimeChecks or (config.isOptimizedBuild(cfg) and runtime:endswith("Debug")) then
 			p.w('<BasicRuntimeChecks>Default</BasicRuntimeChecks>')
 		end
 	end
@@ -1591,7 +1592,7 @@
 
 	function m.runtimeLibrary(cfg)
 		local runtimes = {
-			StaticDebug = "MultiThreadedDebug",
+			StaticDebug   = "MultiThreadedDebug",
 			StaticRelease = "MultiThreaded",
 		}
 		local runtime = runtimes[config.getruntime(cfg)]
diff --git a/tests/actions/vstudio/vc2010/test_compile_settings.lua b/tests/actions/vstudio/vc2010/test_compile_settings.lua
index 215c56e9..5afff53f 100644
--- a/tests/actions/vstudio/vc2010/test_compile_settings.lua
+++ b/tests/actions/vstudio/vc2010/test_compile_settings.lua
@@ -160,7 +160,6 @@
 <ClCompile>
 	<PrecompiledHeader>NotUsing</PrecompiledHeader>
 	<WarningLevel>Level3</WarningLevel>
-	<BasicRuntimeChecks>Default</BasicRuntimeChecks>
 	<Optimization>Full</Optimization>
 	<FunctionLevelLinking>true</FunctionLevelLinking>
 	<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -176,7 +175,6 @@
 <ClCompile>
 	<PrecompiledHeader>NotUsing</PrecompiledHeader>
 	<WarningLevel>Level3</WarningLevel>
-	<BasicRuntimeChecks>Default</BasicRuntimeChecks>
 	<Optimization>MinSpace</Optimization>
 	<FunctionLevelLinking>true</FunctionLevelLinking>
 	<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -192,7 +190,6 @@
 <ClCompile>
 	<PrecompiledHeader>NotUsing</PrecompiledHeader>
 	<WarningLevel>Level3</WarningLevel>
-	<BasicRuntimeChecks>Default</BasicRuntimeChecks>
 	<Optimization>MaxSpeed</Optimization>
 	<FunctionLevelLinking>true</FunctionLevelLinking>
 	<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -208,7 +205,6 @@
 <ClCompile>
 	<PrecompiledHeader>NotUsing</PrecompiledHeader>
 	<WarningLevel>Level3</WarningLevel>
-	<BasicRuntimeChecks>Default</BasicRuntimeChecks>
 	<Optimization>Full</Optimization>
 	<FunctionLevelLinking>true</FunctionLevelLinking>
 	<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -612,7 +608,6 @@
 <ClCompile>
 	<PrecompiledHeader>NotUsing</PrecompiledHeader>
 	<WarningLevel>Level3</WarningLevel>
-	<BasicRuntimeChecks>Default</BasicRuntimeChecks>
 	<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 		]]
 	end