Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove Xbox 360 code from core to move and expand onto a standalone module #1115

Merged
merged 1 commit into from
Jun 14, 2018
Merged

Remove Xbox 360 code from core to move and expand onto a standalone module #1115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion modules/vstudio/tests/_tests.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
29 changes: 0 additions & 29 deletions modules/vstudio/tests/sln2005/test_platforms.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
23 changes: 0 additions & 23 deletions modules/vstudio/tests/vc200x/test_compiler_block.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
--
Expand Down
17 changes: 0 additions & 17 deletions modules/vstudio/tests/vc200x/test_platforms.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
58 changes: 0 additions & 58 deletions modules/vstudio/tests/vc2010/test_imagexex_settings.lua
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions modules/vstudio/tests/vc2010/test_link.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
--
Expand Down
38 changes: 0 additions & 38 deletions modules/vstudio/tests/vc2010/test_output_props.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
--
Expand Down
9 changes: 0 additions & 9 deletions modules/vstudio/tests/vc2010/test_resource_compile.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
--
Expand Down
Loading