Merged in mendsley/premake-dev/xbox360-extension (pull request #59)

In vs2010 Xbox360 builds should create a .exe file as the target for <OutputFile> and leave .xex generation to the Image Conversion task
This commit is contained in:
Jason Perkins 2013-08-17 15:01:05 -04:00
commit 411675d356
3 changed files with 27 additions and 5 deletions

View File

@ -44,7 +44,7 @@
targetextension ".exe"
configuration { "Xbox360", "ConsoleApp or WindowedApp" }
targetextension ".xex"
targetextension ".exe"
configuration { "Windows or Xbox360 or C#", "SharedLib" }
targetprefix ""

View File

@ -74,10 +74,26 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
<LinkIncremental>true</LinkIncremental>
<OutDir>.\</OutDir>
<OutputFile>$(OutDir)MyProject.xex</OutputFile>
<OutputFile>$(OutDir)MyProject.exe</OutputFile>
<IntDir>obj\Debug\</IntDir>
<TargetName>MyProject</TargetName>
<TargetExt>.xex</TargetExt>
<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>.\</OutDir>
<OutputFile>$(OutDir)MyProject.lib</OutputFile>
<IntDir>obj\Debug\</IntDir>
<TargetName>MyProject</TargetName>
<TargetExt>.lib</TargetExt>
<ImageXexOutput>$(OutDir)$(TargetName).xex</ImageXexOutput>
</PropertyGroup>
]]

View File

@ -220,16 +220,22 @@
--
-- Name should use ".xex" for Xbox360 executables.
-- Name should use ".exe" for Xbox360 executables.
--
function suite.nameUsesExe_onWindowsConsoleApp()
kind "ConsoleApp"
system "Xbox360"
i = prepare()
test.isequal("MyProject.xex", i.name)
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.