Merge branch 'master' into fix-vcxproj

2017-12-06 06:18:53 -05:00 · 2017-12-06 06:18:53 -05:00 · 74c588221f
commit 74c588221f
parent 5401bb0480 8e7260997f
1 changed files with 2 additions and 1 deletions
--- a/src/base/project.lua
+++ b/src/base/project.lua
@ -516,7 +516,8 @@
 		local testpattern = function(pattern, pairing, i)
 			local j = 1
 			while i <= #pairing and j <= #pattern do
-				if pairing[i] ~= pattern[j] then
+				local wd = path.wildcards(pattern[j])
+				if pairing[i]:match(wd) ~= pairing[i] then
 					return false
 				end
 				i = i + 1