4 files changed, 19 insertions, 4 deletions
diff --git a/xmake/plugins/doxygen/main.lua b/xmake/plugins/doxygen/main.lua
index 80fd77675..b84754cb2 100644
--- a/xmake/plugins/doxygen/main.lua
+++ b/xmake/plugins/doxygen/main.lua
@@ -71,6 +71,10 @@ end
 
 function main()
 
+    -- @note we cannot use utils.warning() here, it's queued and only shown at the end
+    cprint("${bright color.warning}${text.warning}: ${color.warning}the builtin `xmake doxygen` plugin is deprecated, " ..
+           "please use the doxygen-plugin addon: `xmake addon --install doxygen-plugin`")
+
     -- load configuration
     config.load()
 
diff --git a/xmake/plugins/format/main.lua b/xmake/plugins/format/main.lua
index 408de0421..c8f50a15e 100644
--- a/xmake/plugins/format/main.lua
+++ b/xmake/plugins/format/main.lua
@@ -103,6 +103,10 @@ end
 -- main
 function main()
 
+    -- @note we cannot use utils.warning() here, it's queued and only shown at the end
+    cprint("${bright color.warning}${text.warning}: ${color.warning}the builtin `xmake format` plugin is deprecated, " ..
+           "please use the format-plugin addon: `xmake addon --install format-plugin`")
+
     -- load configuration
     config.load()
 
diff --git a/xmake/plugins/macro/main.lua b/xmake/plugins/macro/main.lua
index 86b50e2da..6c2c8c734 100644
--- a/xmake/plugins/macro/main.lua
+++ b/xmake/plugins/macro/main.lua
@@ -309,6 +309,10 @@ end
 -- main
 function main()
 
+    -- @note we cannot use utils.warning() here, it's queued and only shown at the end
+    cprint("${bright color.warning}${text.warning}: ${color.warning}the builtin `xmake macro` plugin is deprecated, " ..
+           "please use the macro-plugin addon: `xmake addon --install macro-plugin`")
+
     -- list macros
     if option.get("list") then
 
diff --git a/xmake/plugins/project/clang/compile_commands.lua b/xmake/plugins/project/clang/compile_commands.lua
index 2f25194cc..a8fdb547f 100644
--- a/xmake/plugins/project/clang/compile_commands.lua
+++ b/xmake/plugins/project/clang/compile_commands.lua
@@ -69,10 +69,13 @@ end
 -- specify windows sdk verison
 function _get_windows_sdk_arguments(target)
     local args = {}
-    local msvc = target:toolchain("msvc")
-    if msvc then
-        local envs = msvc:runenvs()
-        if envs then
+    if target and target:is_plat("windows") then
+        local toolchain = target:toolchain("msvc") or
+            target:toolchain("clang-cl") or
+            target:toolchain("clang") or
+            target:toolchain("llvm")
+        local envs = toolchain and toolchain:runenvs()
+        if envs and envs.INCLUDE then
             for _, dir in ipairs(path.splitenv(envs.INCLUDE)) do
                 table.insert(args, "-imsvc")
                 table.insert(args, dir)