reimpl unique for flags

1 files changed, 18 insertions, 8 deletions

diff --git a/xmake/scripts/compiler/compiler.lua b/xmake/scripts/compiler/compiler.lua
index a4c5c59b7..ac25f176a 100644
--- a/xmake/scripts/compiler/compiler.lua
+++ b/xmake/scripts/compiler/compiler.lua
@@ -91,24 +91,34 @@ function compiler._make(self, target, filetype, srcfile, objfile)
     for _, flag_name in ipairs(flag_names) do
 
         -- get flags
-        local flags = target[flag_name]
-        if flags then
-            flags = table.concat(compiler._mapflags(self, utils.wrap(flags)), " ")
-        end
+        local flags = table.concat(compiler._mapflags(self, utils.wrap(target[flag_name])), " ")
 
         -- append flags
         flags_target = string.format("%s %s", flags_target, flags or "")
     end
 
+    -- get the includedirs flags from the current project
+    if self._make_includedir then
+        local includedirs = utils.wrap(target.includedirs)
+        for _, includedir in ipairs(includedirs) do
+            flags_target = string.format("%s %s", flags_target, self._make_includedir(configs, includedir))
+        end
+    end
+
+    -- get the defines flags from the current project
+    if self._make_define then
+        local defines = utils.wrap(target.defines)
+        for _, define in ipairs(defines) do
+            flags_target = string.format("%s %s", flags_target, self._make_define(configs, define))
+        end
+    end
+
     -- get the config flags
     local flags_config = ""
     for _, flag_name in ipairs(flag_names) do
         
         -- get flags
-        local flags = config.get(flag_name)
-        if flags then
-            flags = table.concat(compiler._mapflags(self, utils.wrap(flags)), " ")
-        end
+        local flags = table.concat(compiler._mapflags(self, utils.wrap(config.get(flag_name))), " ")
 
         -- append flags
         flags_config = string.format("%s %s", flags_config, flags or "")