update wdk outputdir

4 files changed, 4 insertions, 16 deletions

diff --git a/xmake/rules/wdk/man/xmake.lua b/xmake/rules/wdk/man/xmake.lua
index aa6af830e..d64266b62 100644
--- a/xmake/rules/wdk/man/xmake.lua
+++ b/xmake/rules/wdk/man/xmake.lua
@@ -48,9 +48,6 @@ rule("wdk.man")
         
         -- save ctrpp
         target:data_set("wdk.ctrpp", ctrpp)
-
-        -- save output directory
-        target:data_set("wdk.ctrpp.outputdir", path.join(config.buildir(), ".wdk", "man", config.get("mode") or "generic", config.get("arch") or os.arch(), target:name()))
     end)
 
     -- before build file
@@ -65,7 +62,7 @@ rule("wdk.man")
         local ctrpp = target:data("wdk.ctrpp")
 
         -- get output directory
-        local outputdir = target:data("wdk.ctrpp.outputdir")
+        local outputdir = path.join(target:autogendir(), "rules", "wdk", "man")
 
         -- init args
         local args = {sourcefile}
diff --git a/xmake/rules/wdk/mc/xmake.lua b/xmake/rules/wdk/mc/xmake.lua
index c981bda5b..fd1afaacb 100644
--- a/xmake/rules/wdk/mc/xmake.lua
+++ b/xmake/rules/wdk/mc/xmake.lua
@@ -48,9 +48,6 @@ rule("wdk.mc")
         
         -- save mc
         target:data_set("wdk.mc", mc)
-
-        -- save output directory
-        target:data_set("wdk.mc.outputdir", path.join(config.buildir(), ".wdk", "mc", config.get("mode") or "generic", config.get("arch") or os.arch(), target:name()))
     end)
 
     -- before build file
@@ -65,7 +62,7 @@ rule("wdk.mc")
         local mc = target:data("wdk.mc")
 
         -- get output directory
-        local outputdir = target:data("wdk.mc.outputdir")
+        local outputdir = path.join(target:autogendir(), "rules", "wdk", "mc")
 
         -- init args
         local args = {}
diff --git a/xmake/rules/wdk/mof/xmake.lua b/xmake/rules/wdk/mof/xmake.lua
index a1f643a6c..8caf496cd 100644
--- a/xmake/rules/wdk/mof/xmake.lua
+++ b/xmake/rules/wdk/mof/xmake.lua
@@ -61,9 +61,6 @@ rule("wdk.mof")
         -- save mofcomp and wmimofck
         target:data_set("wdk.mofcomp", mofcomp)
         target:data_set("wdk.wmimofck", wmimofck)
-
-        -- save output directory
-        target:data_set("wdk.mof.outputdir", path.join(config.buildir(), ".wdk", "mof", config.get("mode") or "generic", config.get("arch") or os.arch(), target:name()))
     end)
 
     -- before build file
@@ -81,7 +78,7 @@ rule("wdk.mof")
         local wmimofck = target:data("wdk.wmimofck")
 
         -- get output directory
-        local outputdir = target:data("wdk.mof.outputdir")
+        local outputdir = path.join(target:autogendir(), "rules", "wdk", "mof")
 
         -- add includedirs
         target:add("includedirs", outputdir)
diff --git a/xmake/rules/wdk/tracewpp/xmake.lua b/xmake/rules/wdk/tracewpp/xmake.lua
index d940337f3..6bb13a828 100644
--- a/xmake/rules/wdk/tracewpp/xmake.lua
+++ b/xmake/rules/wdk/tracewpp/xmake.lua
@@ -46,9 +46,6 @@ rule("wdk.tracewpp")
         -- save tracewpp
         target:data_set("wdk.tracewpp", tracewpp)
 
-        -- save output directory
-        target:data_set("wdk.tracewpp.outputdir", path.join(config.buildir(), ".wdk", "wpp", config.get("mode") or "generic", config.get("arch") or os.arch(), target:name()))
-        
         -- save config directory
         target:data_set("wdk.tracewpp.configdir", path.join(wdk.bindir, wdk.sdkver, "WppConfig", "Rev1"))
     end)
@@ -65,7 +62,7 @@ rule("wdk.tracewpp")
         local tracewpp = target:data("wdk.tracewpp")
 
         -- get outputdir
-        local outputdir = target:data("wdk.tracewpp.outputdir")
+        local outputdir = path.join(target:autogendir(), "rules", "wdk", "wpp")
 
         -- get configdir
         local configdir = target:data("wdk.tracewpp.configdir")