diff --git a/modules/vstudio/tests/_tests.lua b/modules/vstudio/tests/_tests.lua
index fad06e6577..c5b80af6f6 100644
--- 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
index 5e3d7d2105..3cf95ba466 100644
--- 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
index c20d67fc31..9fd3c56b54 100644
--- 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 [[
-
- ]]
- end
-
-
--
-- Check handling of forced includes.
--
diff --git a/modules/vstudio/tests/vc200x/test_platforms.lua b/modules/vstudio/tests/vc200x/test_platforms.lua
index 3ad18271ad..3921cfaae9 100644
--- a/modules/vstudio/tests/vc200x/test_platforms.lua
+++ b/modules/vstudio/tests/vc200x/test_platforms.lua
@@ -78,20 +78,3 @@
]]
end
-
-
---
--- Verify the Xbox360 platform.
---
-
- function suite.platformIsCorrect_onXbox360()
- platforms { "Xbox360" }
- prepare()
- test.capture [[
-
-
-
- ]]
- end
diff --git a/modules/vstudio/tests/vc2010/test_imagexex_settings.lua b/modules/vstudio/tests/vc2010/test_imagexex_settings.lua
deleted file mode 100644
index f87e6ec976..0000000000
--- a/modules/vstudio/tests/vc2010/test_imagexex_settings.lua
+++ /dev/null
@@ -1,58 +0,0 @@
---
--- tests/actions/vstudio/vc2010/test_compile_settings.lua
--- Validate Xbox 360 XEX image settings in Visual Studio 2010 C/C++ projects.
--- Copyright (c) 2011-2013 Jason Perkins and the Premake project
---
-
- local p = premake
- local suite = test.declare("vstudio_vs2010_imagexex_settings")
- local vc2010 = p.vstudio.vc2010
- local project = p.project
-
-
---
--- Setup
---
-
- local wks, prj
-
- function suite.setup()
- p.action.set("vs2010")
- wks, prj = test.createWorkspace()
- platforms "xbox360"
- end
-
- local function prepare(platform)
- local cfg = test.getconfig(prj, "Debug", "xbox360")
- vc2010.imageXex(cfg)
- end
-
---
--- Test default ImageXex settings
---
- function suite.defaultSettings()
- prepare()
- test.capture [[
-
-
-
-
-
-
- ]]
- end
-
---
--- Ensure configuration file is output in ImageXex block
---
- function suite.onConfigfile()
- configfile "testconfig.xml"
- prepare()
- test.capture [[
-
- testconfig.xml
-
-
-
- ]]
- end
diff --git a/modules/vstudio/tests/vc2010/test_link.lua b/modules/vstudio/tests/vc2010/test_link.lua
index 12d6020506..df43572a7d 100644
--- 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 [[
-
- user32.lib;%(AdditionalDependencies)
-
- ]]
- 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
index 5ec306e91c..71fb27fa68 100644
--- 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 element to the block.
---
-
- function suite.structureIsCorrect_onXbox360()
- system "Xbox360"
- prepare()
- test.capture [[
-
- true
- bin\Debug\
- $(OutDir)MyProject.exe
- obj\Debug\
- MyProject
- .exe
- $(OutDir)$(TargetName).xex
-
- ]]
- end
-
- function suite.staticLibStructureIsCorrect_onXbox360()
- system "Xbox360"
- kind "StaticLib"
- prepare()
- test.capture [[
-
- bin\Debug\
- $(OutDir)MyProject.lib
- obj\Debug\
- MyProject
- .lib
- $(OutDir)$(TargetName).xex
-
- ]]
- 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
index 956228405a..5532c8aded 100644
--- 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 element should be added.
--
diff --git a/modules/vstudio/vs200x_vcproj.lua b/modules/vstudio/vs200x_vcproj.lua
index a1fe227663..98d85b2afe 100644
--- a/modules/vstudio/vs200x_vcproj.lua
+++ b/modules/vstudio/vs200x_vcproj.lua
@@ -176,46 +176,26 @@
m.VCNMakeTool
}
end
- if cfg.system == p.XBOX360 then
- return {
- m.VCPreBuildEventTool,
- m.VCCustomBuildTool,
- m.VCXMLDataGeneratorTool,
- m.VCWebServiceProxyGeneratorTool,
- m.VCMIDLTool,
- m.VCCLCompilerTool,
- m.VCManagedResourceCompilerTool,
- m.VCResourceCompilerTool,
- m.VCPreLinkEventTool,
- m.VCLinkerTool,
- m.VCALinkTool,
- m.VCX360ImageTool,
- m.VCBscMakeTool,
- m.VCX360DeploymentTool,
- m.VCPostBuildEventTool,
- m.DebuggerTool,
- }
- else
- return {
- m.VCPreBuildEventTool,
- m.VCCustomBuildTool,
- m.VCXMLDataGeneratorTool,
- m.VCWebServiceProxyGeneratorTool,
- m.VCMIDLTool,
- m.VCCLCompilerTool,
- m.VCManagedResourceCompilerTool,
- m.VCResourceCompilerTool,
- m.VCPreLinkEventTool,
- m.VCLinkerTool,
- m.VCALinkTool,
- m.VCManifestTool,
- m.VCXDCMakeTool,
- m.VCBscMakeTool,
- m.VCFxCopTool,
- m.VCAppVerifierTool,
- m.VCPostBuildEventTool,
- }
- end
+
+ return {
+ m.VCPreBuildEventTool,
+ m.VCCustomBuildTool,
+ m.VCXMLDataGeneratorTool,
+ m.VCWebServiceProxyGeneratorTool,
+ m.VCMIDLTool,
+ m.VCCLCompilerTool,
+ m.VCManagedResourceCompilerTool,
+ m.VCResourceCompilerTool,
+ m.VCPreLinkEventTool,
+ m.VCLinkerTool,
+ m.VCALinkTool,
+ m.VCManifestTool,
+ m.VCXDCMakeTool,
+ m.VCBscMakeTool,
+ m.VCFxCopTool,
+ m.VCAppVerifierTool,
+ m.VCPostBuildEventTool,
+ }
end
function m.tools(cfg)
@@ -504,8 +484,6 @@
local prjcfg, filecfg = config.normalize(cfg)
if filecfg and fileconfig.hasCustomBuildRule(filecfg) then
return "VCCustomBuildTool"
- elseif prjcfg and prjcfg.system == p.XBOX360 then
- return "VCCLX360CompilerTool"
else
return "VCCLCompilerTool"
end
@@ -572,8 +550,6 @@
function m.VCLinkerToolName(cfg)
if cfg.kind == p.STATICLIB then
return "VCLibrarianTool"
- elseif cfg.system == p.XBOX360 then
- return "VCX360LinkerTool"
else
return "VCLinkerTool"
end
@@ -692,32 +668,6 @@
------------
- m.elements.VCX360DeploymentTool = function(cfg)
- return {
- m.deploymentType,
- m.additionalDeploymentOptions,
- }
- end
-
- function m.VCX360DeploymentTool(cfg)
- m.VCTool("VCX360DeploymentTool", cfg)
- end
-
- ------------
-
- m.elements.VCX360ImageTool = function(cfg)
- return {
- m.additionalImageOptions,
- m.outputFileName,
- }
- end
-
- function m.VCX360ImageTool(cfg)
- m.VCTool("VCX360ImageTool", cfg)
- end
-
- ------------
-
m.elements.VCXDCMakeTool = function(cfg)
return {}
end
@@ -813,14 +763,6 @@
- function m.additionalDeploymentOptions(cfg)
- if #cfg.deploymentoptions > 0 then
- p.x('AdditionalOptions="%s"', table.concat(cfg.deploymentoptions, " "))
- end
- end
-
-
-
function m.additionalExternalCompilerOptions(cfg, toolset)
local buildoptions = table.join(toolset.getcxxflags(cfg), cfg.buildoptions)
if not cfg.flags.NoPCH and cfg.pchheader then
@@ -1067,13 +1009,7 @@
p.w('DebugInformationFormat="%s"', fmt)
end
end
-
-
-
- function m.deploymentType(cfg)
- p.w('DeploymentType="0"')
- end
-
+
function m.detect64BitPortabilityProblems(cfg)
@@ -1104,7 +1040,7 @@
function m.enableEnhancedInstructionSet(cfg)
local map = { SSE = "1", SSE2 = "2" }
local value = map[cfg.vectorextensions]
- if value and cfg.system ~= "Xbox360" and cfg.architecture ~= "x86_64" then
+ if value and cfg.architecture ~= "x86_64" then
p.w('EnableEnhancedInstructionSet="%d"', value)
end
end
diff --git a/modules/vstudio/vs2010_vcxproj.lua b/modules/vstudio/vs2010_vcxproj.lua
index 85ead404db..b305399d13 100644
--- a/modules/vstudio/vs2010_vcxproj.lua
+++ b/modules/vstudio/vs2010_vcxproj.lua
@@ -225,13 +225,11 @@
m.linkIncremental,
m.ignoreImportLibrary,
m.outDir,
- m.outputFile,
m.intDir,
m.targetName,
m.targetExt,
m.includePath,
m.libraryPath,
- m.imageXexOutput,
m.generateManifest,
m.extensionsToDeleteOnClean,
m.executablePath,
@@ -307,8 +305,6 @@
m.linker,
m.manifest,
m.buildEvents,
- m.imageXex,
- m.deploy,
m.ruleVars,
m.buildLog,
}
@@ -442,7 +438,7 @@
end
function m.resourceCompile(cfg)
- if cfg.system ~= p.XBOX360 and p.config.hasFile(cfg, path.isresourcefile) then
+ if p.config.hasFile(cfg, path.isresourcefile) then
local contents = p.capture(function ()
p.push()
p.callArray(m.elements.resourceCompile, cfg)
@@ -1608,17 +1604,6 @@
end
- function m.deploy(cfg)
- if cfg.system == p.XBOX360 then
- p.push('')
- m.element("DeploymentType", nil, "CopyToHardDrive")
- m.element("DvdEmulationType", nil, "ZeroSeekTimes")
- m.element("DeploymentFiles", nil, "$(RemoteRoot)=$(ImagePath);")
- p.pop('')
- end
- end
-
-
function m.enableDpiAwareness(cfg)
local awareness = {
None = "false",
@@ -1843,29 +1828,6 @@
end
- function m.imageXex(cfg)
- if cfg.system == p.XBOX360 then
- p.push('')
- if cfg.configfile then
- m.element("ConfigurationFile", nil, "%s", cfg.configfile)
- else
- p.w('')
- p.w('')
- end
- p.w('')
- p.w('')
- p.pop('')
- end
- end
-
-
- function m.imageXexOutput(cfg)
- if cfg.system == p.XBOX360 then
- m.element("ImageXexOutput", nil, "%s", "$(OutDir)$(TargetName).xex")
- end
- end
-
-
function m.importLanguageTargets(prj)
p.w('')
end
@@ -2236,13 +2198,6 @@
end
- function m.outputFile(cfg)
- if cfg.system == p.XBOX360 then
- m.element("OutputFile", nil, "$(OutDir)%s", cfg.buildtarget.name)
- end
- end
-
-
function m.executablePath(cfg)
local dirs = vstudio.path(cfg, cfg.bindirs)
if #dirs > 0 then
@@ -2474,10 +2429,8 @@
function m.subSystem(cfg)
- if cfg.system ~= p.XBOX360 then
- local subsystem = iif(cfg.kind == p.CONSOLEAPP, "Console", "Windows")
- m.element("SubSystem", nil, subsystem)
- end
+ local subsystem = iif(cfg.kind == p.CONSOLEAPP, "Console", "Windows")
+ m.element("SubSystem", nil, subsystem)
end
diff --git a/modules/vstudio/vstudio.lua b/modules/vstudio/vstudio.lua
index 1a63513463..83417c9dc4 100644
--- a/modules/vstudio/vstudio.lua
+++ b/modules/vstudio/vstudio.lua
@@ -27,7 +27,6 @@
win32 = "x86",
x86 = "x86",
x86_64 = "x64",
- xbox360 = "Xbox 360",
ARM = "ARM",
ARM64 = "ARM64",
}
diff --git a/src/_premake_init.lua b/src/_premake_init.lua
index eac9fe1c20..846d463132 100644
--- a/src/_premake_init.lua
+++ b/src/_premake_init.lua
@@ -202,13 +202,6 @@
kind = "list:keyed:array:string",
}
- api.register {
- name = "configfile",
- scope = "config",
- kind = "string",
- tokens = true,
- }
-
api.register {
name = "configurations",
scope = "project",
@@ -369,13 +362,6 @@
tokens = true,
}
- api.register {
- name = "deploymentoptions",
- scope = "config",
- kind = "list:string",
- tokens = true,
- }
-
api.register {
name = "disablewarnings",
scope = "config",
@@ -1144,7 +1130,6 @@
"solaris",
"wii",
"windows",
- "xbox360",
},
}
@@ -1400,7 +1385,6 @@
api.alias("buildmessage", "buildMessage")
api.alias("buildoutputs", "buildOutputs")
api.alias("cleanextensions", "cleanExtensions")
- api.alias("configfile", "configFile")
api.alias("dotnetframework", "framework")
api.alias("editandcontinue", "editAndContinue")
api.alias("fileextension", "fileExtension")
@@ -1793,15 +1777,12 @@
filter { "system:Windows or language:C# or language:F#", "kind:ConsoleApp or WindowedApp" }
targetextension ".exe"
- filter { "system:Xbox360", "kind:ConsoleApp or WindowedApp" }
- targetextension ".exe"
-
- filter { "system:Windows or Xbox360", "kind:SharedLib" }
+ filter { "system:Windows", "kind:SharedLib" }
targetprefix ""
targetextension ".dll"
implibextension ".lib"
- filter { "system:Windows or Xbox360", "kind:StaticLib" }
+ filter { "system:Windows", "kind:StaticLib" }
targetprefix ""
targetextension ".lib"
diff --git a/src/base/_foundation.lua b/src/base/_foundation.lua
index e5d8712213..dfec91166e 100644
--- a/src/base/_foundation.lua
+++ b/src/base/_foundation.lua
@@ -56,7 +56,6 @@
premake.X86_64 = "x86_64"
premake.ARM = "ARM"
premake.ARM64 = "ARM64"
- premake.XBOX360 = "xbox360"
diff --git a/tests/config/test_targetinfo.lua b/tests/config/test_targetinfo.lua
index a1d49023a1..58e2d4d47a 100755
--- a/tests/config/test_targetinfo.lua
+++ b/tests/config/test_targetinfo.lua
@@ -183,25 +183,7 @@
test.isequal("libMyProject.a", i.name)
end
-
---
--- Name should use ".exe" for Xbox360 executables.
---
-
- function suite.nameUsesExe_onXbox360ConsoleApp()
- kind "ConsoleApp"
- system "Xbox360"
- i = prepare()
- test.isequal("MyProject.exe", i.name)
- end
-
- function suite.nameUsesLib_onXbox360StaticLib()
- kind "StaticLib"
- system "Xbox360"
- i = prepare()
- test.isequal("MyProject.lib", i.name)
- end
-
+
--
-- Name should use a prefix if set.
--