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

Merge pull request #1402 from yuyoyuppe/fix_1172

Browse Source 
Remove checkFunc from Resource files
This commit is contained in:
Samuel Surtees 2020-02-18 23:12:34 +10:00 committed by GitHub
commit 0a9844891d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/vstudio/tests/vc2010/test_files.lua
View File

@ -277,6 +277,19 @@
flags { "ExcludeFromBuild" } flags { "ExcludeFromBuild" }
prepare() prepare()
test.capture [[ test.capture [[
<ItemGroup>
<ResourceCompile Include="hello.rc">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ResourceCompile>
</ItemGroup>
]]
end
function suite.includedFromBuild_onResourceFile_nonWindows()
files { "hello.rc" }
system "Linux"
prepare()
test.capture [[
<ItemGroup> <ItemGroup>
<ResourceCompile Include="hello.rc" /> <ResourceCompile Include="hello.rc" />
</ItemGroup> </ItemGroup>

4
modules/vstudio/vs2010_vcxproj.lua
View File

@ -865,9 +865,7 @@
m.excludedFromBuild m.excludedFromBuild
} }
m.emitFiles(prj, group, "ResourceCompile", nil, fileCfgFunc, function(cfg) m.emitFiles(prj, group, "ResourceCompile", nil, fileCfgFunc)
return cfg.system == p.WINDOWS
end)
end, end,
emitFilter = function(prj, group) emitFilter = function(prj, group)