Merge pull request #2183 from yamashi/patch-1

Add resource files include and pre-processor defines for the VS gener…

1 files changed, 36 insertions, 0 deletions

diff --git a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
index 0bd27177a..b00b36750 100644
--- a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
+++ b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
@@ -493,6 +493,36 @@ function _make_source_options_cl(vcxprojfile, flags, condition)
     end
 end
 
+-- make source options for cl
+function _make_resource_options_cl(vcxprojfile, flags)
+
+    -- get flags string
+    local flagstr = os.args(flags)
+    
+    -- make PreprocessorDefinitions
+    local defstr = ""
+    for _, flag in ipairs(flags) do
+        flag:gsub("^[%-/]D(.*)",
+            function (def)
+                defstr = defstr .. vsutils.escape(def) .. ";"
+            end
+        )
+    end
+    defstr = defstr .. "%%(PreprocessorDefinitions)"
+    vcxprojfile:print("<PreprocessorDefinitions>%s</PreprocessorDefinitions>", defstr)
+
+    -- make AdditionalIncludeDirectories
+    if flagstr:find("[%-/]I") then
+        local dirs = {}
+        for _, flag in ipairs(flags) do
+            flag:gsub("^[%-/]I(.*)", function (dir) table.insert(dirs, vsutils.escape(dir)) end)
+        end
+        if #dirs > 0 then
+            vcxprojfile:print("<AdditionalIncludeDirectories>%s</AdditionalIncludeDirectories>", table.concat(dirs, ";"))
+        end
+    end
+end
+
 -- make source options for cuda
 function _make_source_options_cuda(vcxprojfile, flags, opt)
 
@@ -877,6 +907,12 @@ function _make_common_item(vcxprojfile, vsinfo, target, targetinfo)
 
     vcxprojfile:leave("</ClCompile>")
     
+    vcxprojfile:enter("<ResourceCompile>")
+        -- make resource options
+        _make_resource_options_cl(vcxprojfile, targetinfo.commonflags.cl)
+    
+    vcxprojfile:leave("</ResourceCompile>")
+    
     local cuda = _check_cuda(target)
     if cuda then
         -- for CUDA linker?