AuroraPipeline/fuck-premake-old2
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merged in tbasnoopy/premake-dev/buildoutput fix (pull request #149)

Browse Source 
add missing buildoutputs fix for vs2010
This commit is contained in:
Jason Perkins 2015-02-18 15:13:41 -05:00
commit 2ae3479f58
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/actions/vstudio/vs2010_vcxproj.lua
View File

@ -660,7 +660,7 @@
m.element("Command", condition, '%s', commands)
local outputs = project.getrelative(prj, filecfg.buildoutputs)
m.element("Outputs", condition, '%s', table.concat(outputs, " "))
m.element("Outputs", condition, '%s', table.concat(outputs, ";"))
if filecfg.buildmessage then
m.element("Message", condition, '%s', filecfg.buildmessage)

19
tests/actions/vstudio/vc2010/test_files.lua
View File

@ -102,6 +102,25 @@
]]
end
function suite.customBuild_onBuildRuleMultipleBuildOutputs()
files { "hello.cg" }
filter "files:**.cg"
buildcommands { "cgc $(InputFile)" }
buildoutputs { "$(InputName).a", "$(InputName).b" }
prepare()
test.capture [[
<ItemGroup>
<CustomBuild Include="hello.cg">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cgc $(InputFile)</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(InputName).a;$(InputName).b</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cgc $(InputFile)</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(InputName).a;$(InputName).b</Outputs>
</CustomBuild>
</ItemGroup>
]]
end
function suite.customBuild_onBuildRuleWithMessage()
files { "hello.cg" }
filter "files:**.cg"