enhance add_filegroups to support combining folders

Domain · Jun 1, 2022 · 480f9ca · 480f9ca
1 parent 1191707
commit 480f9ca
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua
@@ -366,12 +366,16 @@ function _make_filter(filepath, target, vcxprojdir)
                         filter = path.normalize(filegroup)
                     else
                         -- file tree mode (default)
-                        filter = path.normalize(path.join(filegroup, path.directory(fileitem)))
+                        if filegroup == "" then
+                            filter = path.normalize(path.directory(fileitem))
+                        else
+                            filter = path.normalize(path.join(filegroup, path.directory(fileitem)))
+                        end
                     end
                     if filter and filter == '.' then
                         filter = nil
                     end
-                    break
+                    return filter
                 end
             end
         end