More changes to match VC2008 project defaults; avoid unnecessary changesets

src/actions/vstudio/vs200x_vcproj.lua

@@ -176,6 +176,7 @@
 	function vc200x.emptyconfiguration(cfg, arch)
 		_p(2,'<Configuration')
 		_x(3,'Name="%s|%s"', vstudio.projectplatform(cfg), arch)
+		_p(3,'IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"')
 		_p(3,'ConfigurationType="1"')
 		_p(3,'>')
 	
@@ -256,12 +257,6 @@
 			_p(4,'MinimalRebuild="%s"', bool(true))
 		end
 		
-		if cfg.flags.NoExceptions then
-			_p(4,'ExceptionHandling="%s"', iif(_ACTION < "vs2005", "FALSE", 0))
-		elseif cfg.flags.SEH and _ACTION > "vs2003" then
-			_p(4,'ExceptionHandling="2"')
-		end
-		
 		if vc200x.optimization(cfg) == 0 and not cfg.flags.Managed then
 			_p(4,'BasicRuntimeChecks="3"')
 		end
@@ -270,6 +265,12 @@
 			_p(4,'StringPooling="%s"', bool(true))
 		end
 		
+		if cfg.flags.NoExceptions then
+			_p(4,'ExceptionHandling="%s"', iif(_ACTION < "vs2005", "FALSE", 0))
+		elseif cfg.flags.SEH and _ACTION > "vs2003" then
+			_p(4,'ExceptionHandling="2"')
+		end
+		
 		local runtime
 		if premake.config.isdebugbuild(cfg) then
 			runtime = iif(cfg.flags.StaticRuntime, 1, 3)
@@ -334,16 +335,10 @@
 
 
 	function vc200x.VCCLExternalCompilerTool(cfg, toolset)
-		local buildoptions = table.join(toolset.getcflags(cfg), toolset.getcxxflags(cfg), cfg.buildoptions)
-		
+		local buildoptions = table.join(toolset.getcflags(cfg), toolset.getcxxflags(cfg), cfg.buildoptions)		
 		if not cfg.flags.NoPCH and cfg.pchheader then
-			_p(4,'UsePrecompiledHeader="%s"', iif(_ACTION < "vs2005", 3, 2))
-			_x(4,'PrecompiledHeaderThrough="%s"', path.getname(cfg.pchheader))
 			table.insert(buildoptions, '--use_pch="$(IntDir)/$(TargetName).pch"')
-		else
-			_p(4,'UsePrecompiledHeader="%s"', iif(_ACTION > "vs2003" or cfg.flags.NoPCH, 0, 2))
 		end
-
 		if #buildoptions > 0 then
 			_x(4,'AdditionalOptions="%s"', table.concat(buildoptions, " "))
 		end
@@ -351,6 +346,13 @@
 		vc200x.additionalIncludeDirectories(cfg, cfg.includedirs)
 		vc200x.preprocessorDefinitions(cfg, cfg.defines)
 
+		if not cfg.flags.NoPCH and cfg.pchheader then
+			_p(4,'UsePrecompiledHeader="%s"', iif(_ACTION < "vs2005", 3, 2))
+			_x(4,'PrecompiledHeaderThrough="%s"', path.getname(cfg.pchheader))
+		else
+			_p(4,'UsePrecompiledHeader="%s"', iif(_ACTION > "vs2003" or cfg.flags.NoPCH, 0, 2))
+		end
+
 		_x(4,'ProgramDataBaseFileName="$(OutDir)\\%s.pdb"', config.gettargetinfo(cfg).basename)
 
 		_p(4,'DebugInformationFormat="0"')
@@ -482,12 +484,12 @@
 			end
 		end
 		
-		if #manifests > 0 then
 			_p(3,'<Tool')
 			_p(4,'Name="VCManifestTool"')
-			_x(4,'AdditionalManifestFiles="%s"', table.concat(manifests, ";"))
+			if #manifests > 0 then
+				_x(4,'AdditionalManifestFiles="%s"', table.concat(manifests, ";"))
+			end
 			_p(3,'/>')
-		end
 	end
 
 
@@ -666,6 +668,7 @@
 				"VCXDCMakeTool",
 				"VCBscMakeTool",
 				"VCFxCopTool",
+				"VCAppVerifierTool",
 				"VCPostBuildEventTool"
 			}
 		end

tests/actions/vstudio/vc200x/test_external_compiler.lua

@@ -36,8 +36,8 @@
 		test.capture [[
 			<Tool
 				Name="VCCLCompilerTool"
-				UsePrecompiledHeader="0"
 				AdditionalOptions="-Xc+=exceptions -Xc+=rtti"
+				UsePrecompiledHeader="0"
 				ProgramDataBaseFileName="$(OutDir)\MyProject.pdb"
 				DebugInformationFormat="0"
 				CompileAs="0"
@@ -56,8 +56,8 @@
 		test.capture [[
 			<Tool
 				Name="VCCLCompilerTool"
-				UsePrecompiledHeader="0"
 				AdditionalOptions="-Xc+=exceptions -Xc+=rtti"
 				AdditionalIncludeDirectories="..\include;include"
+				UsePrecompiledHeader="0"
 		]]
 	end

tests/actions/vstudio/vc200x/test_manifest_block.lua

@@ -33,7 +33,11 @@
 	function suite.isEmpty_onNoManifests()
 		files { "hello.c" }
 		prepare()
-		test.isemptycapture()
+		test.capture [[
+			<Tool
+				Name="VCManifestTool"
+			/>
+		]]
 	end