Merge pull request #1402 from yuyoyuppe/fix_1172

Remove checkFunc from Resource files
premake · Feb 18, 2020 · 0a98448 · 0a98448
2 parents 789c0ac + 374618b
commit 0a98448
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/modules/vstudio/tests/vc2010/test_files.lua b/modules/vstudio/tests/vc2010/test_files.lua
@@ -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>

diff --git a/modules/vstudio/vs2010_vcxproj.lua b/modules/vstudio/vs2010_vcxproj.lua
@@ -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)