improve wdk rules

6 files changed, 8 insertions, 8 deletions

diff --git a/tests/projects/wdk/kmdf/ioctl/xmake.lua b/tests/projects/wdk/kmdf/ioctl/xmake.lua
index 6c7c6f7a7..c630367b5 100644
--- a/tests/projects/wdk/kmdf/ioctl/xmake.lua
+++ b/tests/projects/wdk/kmdf/ioctl/xmake.lua
@@ -9,7 +9,7 @@ add_includedirs(".")
 target("nonpnp")
 
     -- add rules
-    add_rules("wdk.kmdf.driver")
+    add_rules("wdk.env.kmdf", "wdk.driver")
 
     -- add flags for rule: wdk.tracewpp
     add_values("wdk.tracewpp.flags", "-func:TraceEvents(LEVEL,FLAGS,MSG,...)", "-func:Hexdump((LEVEL,FLAGS,MSG,...))")
@@ -22,7 +22,7 @@ target("nonpnp")
 target("app")
 
     -- add rules
-    add_rules("wdk.kmdf.binary")
+    add_rules("wdk.env.kmdf", "wdk.binary")
 
     -- add files
     add_files("exe/*.c") 
diff --git a/tests/projects/wdk/kmdf/serial/xmake.lua b/tests/projects/wdk/kmdf/serial/xmake.lua
index f3b55d5d9..0a6143838 100644
--- a/tests/projects/wdk/kmdf/serial/xmake.lua
+++ b/tests/projects/wdk/kmdf/serial/xmake.lua
@@ -6,7 +6,7 @@ add_rules("mode.debug", "mode.release")
 target("wdfserial")
 
     -- add rules
-    add_rules("wdk.kmdf.driver")
+    add_rules("wdk.env.kmdf", "wdk.driver")
 
     -- add flags for rule: wdk.tracewpp
     add_values("wdk.tracewpp.flags", "-func:SerialDbgPrintEx(LEVEL,FLAGS,MSG,...)")
diff --git a/tests/projects/wdk/umdf/echo/xmake.lua b/tests/projects/wdk/umdf/echo/xmake.lua
index 414c2f074..582e9ee46 100644
--- a/tests/projects/wdk/umdf/echo/xmake.lua
+++ b/tests/projects/wdk/umdf/echo/xmake.lua
@@ -9,7 +9,7 @@ add_defines("_UNICODE", "UNICODE")
 target("echo")
 
     -- add rules
-    add_rules("wdk.umdf.driver")
+    add_rules("wdk.env.umdf", "wdk.driver")
 
     -- set test sign
 --    set_values("wdk.sign.mode", "test")
@@ -29,7 +29,7 @@ target("echo")
 target("app")
 
     -- add rules
-    add_rules("wdk.umdf.binary")
+    add_rules("wdk.env.umdf", "wdk.binary")
 
     -- add files
     add_files("exe/*.cpp") 
diff --git a/tests/projects/wdk/umdf/skeleton/xmake.lua b/tests/projects/wdk/umdf/skeleton/xmake.lua
index 75e5ec7e1..0cd653885 100644
--- a/tests/projects/wdk/umdf/skeleton/xmake.lua
+++ b/tests/projects/wdk/umdf/skeleton/xmake.lua
@@ -9,7 +9,7 @@ add_defines("_UNICODE", "UNICODE")
 target("UMDFSkeleton")
 
     -- add rules
-    add_rules("wdk.umdf.driver")
+    add_rules("wdk.env.umdf", "wdk.driver")
 
     -- add flags fro tracewpp
     add_values("wdk.tracewpp.flags", "-scan:internal.h")
diff --git a/tests/projects/wdk/wdm/msdsm/xmake.lua b/tests/projects/wdk/wdm/msdsm/xmake.lua
index ea8886d83..069f69767 100644
--- a/tests/projects/wdk/wdm/msdsm/xmake.lua
+++ b/tests/projects/wdk/wdm/msdsm/xmake.lua
@@ -6,7 +6,7 @@ add_rules("mode.debug", "mode.release")
 target("sampledsm")
 
     -- add rules
-    add_rules("wdk.wdm.driver")
+    add_rules("wdk.env.wdm", "wdk.driver")
 
     -- add flags for rule: wdk.tracewpp
     add_values("wdk.tracewpp.flags", "-func:TracePrint((LEVEL,FLAGS,MSG,...))")
diff --git a/tests/projects/wdk/wdm/perfcounters/xmake.lua b/tests/projects/wdk/wdm/perfcounters/xmake.lua
index fb0bc3d54..21a36ee4c 100644
--- a/tests/projects/wdk/wdm/perfcounters/xmake.lua
+++ b/tests/projects/wdk/wdm/perfcounters/xmake.lua
@@ -6,7 +6,7 @@ add_rules("mode.debug", "mode.release")
 target("kcs")
 
     -- add rules
-    add_rules("wdk.wdm.driver")
+    add_rules("wdk.env.wdm", "wdk.driver")
 
     -- add flags for rule: wdk.man
     add_values("wdk.man.prefix", "Kcs")