Merge pull request #1115 from redorav/remove_xbox360

Remove Xbox 360 code from core to move and expand onto a standalone module
premake · Jun 14, 2018 · 30ab624 · 30ab624
2 parents fddc822 + 1cb240d
commit 30ab624
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 382 deletions.
diff --git a/modules/vstudio/tests/_tests.lua b/modules/vstudio/tests/_tests.lua
@@ -69,7 +69,6 @@ return {
 	"vc2010/test_files.lua",
 	"vc2010/test_filter_ids.lua",
 	"vc2010/test_filters.lua",
-	"vc2010/test_imagexex_settings.lua",
 	"vc2010/test_item_def_group.lua",
 	"vc2010/test_link.lua",
 	"vc2010/test_manifest.lua",

diff --git a/modules/vstudio/tests/sln2005/test_platforms.lua b/modules/vstudio/tests/sln2005/test_platforms.lua
@@ -460,35 +460,6 @@ EndGlobalSection
 	end
 
 
---
--- If the platform identifier matches a system or architecture, omit it
--- from the configuration description.
---
-
-	function suite.onSingleCpp_withPlatformsMatchingArch_noArchs()
-		platforms { "x86", "Xbox360" }
-		project "MyProject"
-		prepare()
-		test.capture [[
-GlobalSection(SolutionConfigurationPlatforms) = preSolution
-	Debug|Win32 = Debug|Win32
-	Debug|Xbox 360 = Debug|Xbox 360
-	Release|Win32 = Release|Win32
-	Release|Xbox 360 = Release|Xbox 360
-EndGlobalSection
-GlobalSection(ProjectConfigurationPlatforms) = postSolution
-	{C9135098-6047-8142-B10E-D27E7F73FCB3}.Debug|Win32.ActiveCfg = Debug|Win32
-	{C9135098-6047-8142-B10E-D27E7F73FCB3}.Debug|Win32.Build.0 = Debug|Win32
-	{C9135098-6047-8142-B10E-D27E7F73FCB3}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
-	{C9135098-6047-8142-B10E-D27E7F73FCB3}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
-	{C9135098-6047-8142-B10E-D27E7F73FCB3}.Release|Win32.ActiveCfg = Release|Win32
-	{C9135098-6047-8142-B10E-D27E7F73FCB3}.Release|Win32.Build.0 = Release|Win32
-	{C9135098-6047-8142-B10E-D27E7F73FCB3}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
-	{C9135098-6047-8142-B10E-D27E7F73FCB3}.Release|Xbox 360.Build.0 = Release|Xbox 360
-EndGlobalSection
-		]]
-	end
-
 	function suite.onSingleCs_withPlatformsMatchingArch_noArchs()
 		platforms { "x86", "x86_64" }
 		project "MyProject"

diff --git a/modules/vstudio/tests/vc200x/test_compiler_block.lua b/modules/vstudio/tests/vc200x/test_compiler_block.lua
@@ -441,29 +441,6 @@
 		]]
 	end
 
-
---
--- Xbox 360 uses the same structure, but changes the element name.
---
-
-	function suite.looksGood_onXbox360()
-		system "Xbox360"
-		prepare()
-		test.capture [[
-<Tool
-	Name="VCCLX360CompilerTool"
-	Optimization="0"
-	BasicRuntimeChecks="3"
-	RuntimeLibrary="2"
-	EnableFunctionLevelLinking="true"
-	UsePrecompiledHeader="0"
-	WarningLevel="3"
-	DebugInformationFormat="0"
-/>
-		]]
-	end
-
-
 --
 -- Check handling of forced includes.
 --

diff --git a/modules/vstudio/tests/vc200x/test_platforms.lua b/modules/vstudio/tests/vc200x/test_platforms.lua
@@ -78,20 +78,3 @@
 </Platforms>
 		]]
 	end
-
-
---
--- Verify the Xbox360 platform.
---
-
-	function suite.platformIsCorrect_onXbox360()
-		platforms { "Xbox360" }
-		prepare()
-		test.capture [[
-<Platforms>
-	<Platform
-		Name="Xbox 360"
-	/>
-</Platforms>
-		]]
-	end
diff --git a/modules/vstudio/tests/vc2010/test_imagexex_settings.lua b/modules/vstudio/tests/vc2010/test_imagexex_settings.lua
diff --git a/modules/vstudio/tests/vc2010/test_link.lua b/modules/vstudio/tests/vc2010/test_link.lua
@@ -621,35 +621,6 @@
 		]]
 	end
 
-
---
--- Xbox 360 doesn't list a subsystem or entry point.
---
-
-	function suite.onXbox360()
-		kind "ConsoleApp"
-		system "Xbox360"
-		prepare()
-		test.capture [[
-		]]
-	end
-
---
--- Xbox 360 uses .lib for library extensions
---
-	function suite.libAdded_onXbox360SystemLibs()
-		kind "ConsoleApp"
-		system "Xbox360"
-		links { "user32" }
-		prepare()
-		test.capture [[
-<Link>
-	<AdditionalDependencies>user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-</Link>
-		]]
-	end
-
-
 --
 -- Check handling of warning flags.
 --

diff --git a/modules/vstudio/tests/vc2010/test_output_props.lua b/modules/vstudio/tests/vc2010/test_output_props.lua
@@ -60,44 +60,6 @@
 		test.isemptycapture()
 	end
 
-
---
--- Xbox360 adds an extra <OutputFile> element to the block.
---
-
-	function suite.structureIsCorrect_onXbox360()
-		system "Xbox360"
-		prepare()
-		test.capture [[
-<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
-	<LinkIncremental>true</LinkIncremental>
-	<OutDir>bin\Debug\</OutDir>
-	<OutputFile>$(OutDir)MyProject.exe</OutputFile>
-	<IntDir>obj\Debug\</IntDir>
-	<TargetName>MyProject</TargetName>
-	<TargetExt>.exe</TargetExt>
-	<ImageXexOutput>$(OutDir)$(TargetName).xex</ImageXexOutput>
-</PropertyGroup>
-		]]
-	end
-
-	function suite.staticLibStructureIsCorrect_onXbox360()
-		system "Xbox360"
-		kind "StaticLib"
-		prepare()
-		test.capture [[
-<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
-	<OutDir>bin\Debug\</OutDir>
-	<OutputFile>$(OutDir)MyProject.lib</OutputFile>
-	<IntDir>obj\Debug\</IntDir>
-	<TargetName>MyProject</TargetName>
-	<TargetExt>.lib</TargetExt>
-	<ImageXexOutput>$(OutDir)$(TargetName).xex</ImageXexOutput>
-</PropertyGroup>
-		]]
-	end
-
-
 --
 -- Static libraries should omit the link incremental element entirely.
 --

diff --git a/modules/vstudio/tests/vc2010/test_resource_compile.lua b/modules/vstudio/tests/vc2010/test_resource_compile.lua
@@ -43,15 +43,6 @@
 		test.isemptycapture()
 	end
 
-	function suite.skips_onXbox360()
-		files { "hello.rc" }
-		defines { "DEBUG" }
-		system "Xbox360"
-		prepare()
-		test.isemptycapture()
-	end
-
-
 --
 -- If defines are specified, the <PreprocessorDefinitions> element should be added.
 --