Merge pull request #1402 from yuyoyuppe/fix_1172

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

View File

@ -277,6 +277,19 @@
flags { "ExcludeFromBuild" }
prepare()
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>
<ResourceCompile Include="hello.rc" />
</ItemGroup>

View File

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