Commits

Jason Perkins committed 5b7e01c Merge

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

Comments (0)

Files changed (3)

src/_premake_init.lua

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

tests/actions/vstudio/vc2010/test_output_props.lua

 	<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>
 		]]

tests/config/test_targetinfo.lua

 
 
 --
--- 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.