add linkdirs and includedirs for platform

2 files changed, 37 insertions, 2 deletions

diff --git a/xmake/scripts/base/compiler.lua b/xmake/scripts/base/compiler.lua
index bbf9a6106..e8f2508de 100644
--- a/xmake/scripts/base/compiler.lua
+++ b/xmake/scripts/base/compiler.lua
@@ -141,10 +141,31 @@ function compiler._addflags_from_platform(module, flags, flagnames)
     -- check
     assert(module and flags and flagnames)
 
-    -- done
+    -- add flags 
     for _, flagname in ipairs(flagnames) do
         table.join2(flags, compiler._mapflags(module, platform.get(flagname)))
     end
+
+    -- add the includedirs flags
+    if module.flag_includedir then
+        for _, includedir in ipairs(utils.wrap(platform.get("includedirs"))) do
+            table.join2(flags, module:flag_includedir(includedir))
+        end
+    end
+
+    -- add the defines flags 
+    if module.flag_define then
+        for _, define in ipairs(utils.wrap(platform.get("defines"))) do
+            table.join2(flags, module:flag_define(define))
+        end
+    end
+
+    -- append the undefines flags
+    if module.flag_undefine then
+        for _, undefine in ipairs(utils.wrap(platform.get("undefines"))) do
+            table.join2(flags, module:flag_undefine(undefine))
+        end
+    end
 end
 
 -- add flags from the target 
diff --git a/xmake/scripts/base/linker.lua b/xmake/scripts/base/linker.lua
index a521a1cbf..caddaadc4 100644
--- a/xmake/scripts/base/linker.lua
+++ b/xmake/scripts/base/linker.lua
@@ -149,8 +149,22 @@ function linker._addflags_from_platform(module, flags, flagname)
     -- check
     assert(module and flags and flagname)
 
-    -- done
+    -- add flags
     table.join2(flags, linker._mapflags(module, platform.get(flagname)))
+
+    -- add the linkdirs flags 
+    if module.flag_linkdir then
+        for _, linkdir in ipairs(utils.wrap(platform.get("linkdirs"))) do
+            table.join2(flags, module:flag_linkdir(linkdir))
+        end
+    end
+
+    -- add the links flags 
+    if module.flag_link then
+        for _, link in ipairs(utils.wrap(platform.get("links"))) do
+            table.join2(flags, module:flag_link(link))
+        end
+    end
 end
 
 -- add flags from the target