From 316242ad7237346af8518cf62ace035e9ce01e70 Mon Sep 17 00:00:00 2001
From: Jason Perkins <starkos@industriousone.com>
Date: Fri, 10 Feb 2012 14:04:03 -0500
Subject: Xbox360 fixes for VS2010

---
 src/actions/vstudio/vs2005_solution.lua        | 3 ---
 src/actions/vstudio/vs2010_vcxproj.lua         | 9 ++++++++-
 tests/actions/vstudio/sln2005/dependencies.lua | 9 ---------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/actions/vstudio/vs2005_solution.lua b/src/actions/vstudio/vs2005_solution.lua
index 3f4622b..a5bbd70 100644
--- a/src/actions/vstudio/vs2005_solution.lua
+++ b/src/actions/vstudio/vs2005_solution.lua
@@ -67,9 +67,6 @@
 --
 
 	function sln2005.projectdependencies(prj)
-		-- VS2010 C# gets dependencies right from the projects; doesn't need rules here
-		if _ACTION > "vs2008" and prj.language == "C#" then return end
-
 		local deps = premake.getdependencies(prj)
 		if #deps > 0 then
 			_p('\tProjectSection(ProjectDependencies) = postProject')
diff --git a/src/actions/vstudio/vs2010_vcxproj.lua b/src/actions/vstudio/vs2010_vcxproj.lua
index bc7bd2e..1335390 100644
--- a/src/actions/vstudio/vs2010_vcxproj.lua
+++ b/src/actions/vstudio/vs2010_vcxproj.lua
@@ -127,6 +127,12 @@
 				local cfg = premake.getconfig(prj, cfginfo.src_buildcfg, cfginfo.src_platform)
 				_p(2,'<OutDir '..if_config_and_platform() ..'>%s\\</OutDir>'
 						, premake.esc(cfginfo.name),premake.esc(cfg.buildtarget.directory) )
+
+				if cfg.platform == "Xbox360" then
+					_p(2,'<OutputFile '..if_config_and_platform() ..'>$(OutDir)%s</OutputFile>'
+							, premake.esc(cfginfo.name),cfg.buildtarget.name )
+				end						
+
 				_p(2,'<IntDir '..if_config_and_platform() ..'>%s\\</IntDir>'
 						, premake.esc(cfginfo.name), premake.esc(cfg.objectsdir))
 				_p(2,'<TargetName '..if_config_and_platform() ..'>%s</TargetName>'
@@ -362,7 +368,8 @@
 	end
 
 	local function item_def_lib(cfg)
-		if cfg.kind == 'StaticLib' then
+       -- The Xbox360 project files are stored in another place in the project file.
+		if cfg.kind == 'StaticLib' and cfg.platform ~= "Xbox360" then
 			_p(1,'<Lib>')
 				_p(2,'<OutputFile>$(OutDir)%s</OutputFile>',cfg.buildtarget.name)
 				additional_options(2,cfg)
diff --git a/tests/actions/vstudio/sln2005/dependencies.lua b/tests/actions/vstudio/sln2005/dependencies.lua
index 91948d4..a9fbffd 100755
--- a/tests/actions/vstudio/sln2005/dependencies.lua
+++ b/tests/actions/vstudio/sln2005/dependencies.lua
@@ -56,12 +56,3 @@
 	EndProjectSection
 		]]
 	end
-
-
-	function suite.On2010_Cs()
-		-- 2010 C# gets rules from the projects rather than the solution
-		_ACTION = "vs2010"
-		prepare("C#")
-		local actual = io.endcapture()
-		test.istrue(actual:len() == 0)
-	end
-- 
cgit v1.2.3