Skip to content

Commit

Permalink
Remove checkFunc from Resource files
Browse files Browse the repository at this point in the history
  • Loading branch information
yuyoyuppe committed Feb 18, 2020
1 parent 789c0ac commit 374618b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
13 changes: 13 additions & 0 deletions modules/vstudio/tests/vc2010/test_files.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 1 addition & 3 deletions modules/vstudio/vs2010_vcxproj.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 374618b

Please sign in to comment.