From 9abdbc065e073bc8a6e094be753755a3cead9add Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 21 Aug 2023 23:47:55 +0800 Subject: improve include filter --- .../project/vstudio/impl/vs201x_vcxproj_filters.lua | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'xmake/plugins') diff --git a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua index a6e11b6a4..caed16b2a 100644 --- a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua +++ b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua @@ -177,15 +177,13 @@ function _make_sources(filtersfile, vsinfo, target, vcxprojdir) filtersfile:leave("") end --- make headers -function _make_headers(filtersfile, vsinfo, target, vcxprojdir) - - -- and headers +-- make includes +function _make_includes(filtersfile, vsinfo, target, vcxprojdir) filtersfile:enter("") - for _, headerfile in ipairs(target.headerfiles) do - local filter = _make_filter(headerfile, target, vcxprojdir) + for _, includefile in ipairs(table.join(target.headerfiles or {}, target.extrafiles)) do + local filter = _make_filter(includefile, target, vcxprojdir) if filter then - filtersfile:enter("", path.relative(path.absolute(headerfile), vcxprojdir)) + filtersfile:enter("", path.relative(path.absolute(includefile), vcxprojdir)) filtersfile:print("%s", filter) filtersfile:leave("") end @@ -218,8 +216,8 @@ function make(vsinfo, target) -- make sources _make_sources(filtersfile, vsinfo, target, vcxprojdir) - -- make headers - _make_headers(filtersfile, vsinfo, target, vcxprojdir) + -- make includes + _make_includes(filtersfile, vsinfo, target, vcxprojdir) -- make tailer _make_tailer(filtersfile, vsinfo) -- cgit v1.3.1