summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2018-06-05 00:31:26 +0800
committerruki <[email protected]>2018-06-04 21:08:39 +0800
commit4c84a126bbaa577bd8a023257c42ca2892f26338 (patch)
treeab77e78a985466b1b424c4cc86384f55ade6a44b
parent20d0fc6706aab723049bc7ae148c4d74050cd8ab (diff)
add wdk_winver config option
-rw-r--r--xmake/platforms/windows/xmake.lua7
-rw-r--r--xmake/rules/wdk/load.lua12
2 files changed, 13 insertions, 6 deletions
diff --git a/xmake/platforms/windows/xmake.lua b/xmake/platforms/windows/xmake.lua
index 4d8680e26..0ca6d2b86 100644
--- a/xmake/platforms/windows/xmake.lua
+++ b/xmake/platforms/windows/xmake.lua
@@ -99,6 +99,13 @@ platform("windows")
, {category = "WDK Configuration" }
, {nil, "wdk", "kv", "auto", "The WDK Directory" }
, {nil, "wdk_sdkver","kv", "auto", "The WDK Version" }
+ , {nil, "wdk_winver","kv", "auto", "The WDK Windows Version",
+ " - win10_rs3",
+ " - win10",
+ " - win81",
+ " - win8",
+ " - win7",
+ " - win7_[sp1|sp2|sp3]" }
}
, global =
diff --git a/xmake/rules/wdk/load.lua b/xmake/rules/wdk/load.lua
index 6a597aeed..aa72757cd 100644
--- a/xmake/rules/wdk/load.lua
+++ b/xmake/rules/wdk/load.lua
@@ -84,7 +84,7 @@ function umdf_driver(target)
target:set("kind", "shared")
-- add defines
- local winver = target:values("wdk.env.winver")
+ local winver = target:values("wdk.env.winver") or config.get("wdk_winver")
local umdfver = wdk.umdfver:split('%.')
if arch == "x64" then
target:add("defines", "_WIN64", "_AMD64_", "AMD64")
@@ -139,7 +139,7 @@ function umdf_binary(target)
target:set("kind", "binary")
-- add defines
- local winver = target:values("wdk.env.winver")
+ local winver = target:values("wdk.env.winver") or config.get("wdk_winver")
if arch == "x64" then
target:add("defines", "_WIN64", "_AMD64_", "AMD64")
else
@@ -178,7 +178,7 @@ function kmdf_driver(target)
target:set("filename", target:basename() .. ".sys")
-- add defines
- local winver = target:values("wdk.env.winver")
+ local winver = target:values("wdk.env.winver") or config.get("wdk_winver")
local kmdfver = wdk.kmdfver:split('%.')
if arch == "x64" then
target:add("defines", "_WIN64", "_AMD64_", "AMD64")
@@ -241,7 +241,7 @@ function kmdf_binary(target)
target:set("kind", "binary")
-- add defines
- local winver = target:values("wdk.env.winver")
+ local winver = target:values("wdk.env.winver") or config.get("wdk_winver")
local kmdfver = wdk.kmdfver:split('%.')
if arch == "x64" then
target:add("defines", "_WIN64", "_AMD64_", "AMD64")
@@ -285,7 +285,7 @@ function wdm_driver(target)
target:set("filename", target:basename() .. ".sys")
-- add defines
- local winver = target:values("wdk.env.winver")
+ local winver = target:values("wdk.env.winver") or config.get("wdk_winver")
local kmdfver = wdk.kmdfver:split('%.')
if arch == "x64" then
target:add("defines", "_WIN64", "_AMD64_", "AMD64")
@@ -347,7 +347,7 @@ function wdm_binary(target)
target:set("kind", "binary")
-- add defines
- local winver = target:values("wdk.env.winver")
+ local winver = target:values("wdk.env.winver") or config.get("wdk_winver")
local kmdfver = wdk.kmdfver:split('%.')
if arch == "x64" then
target:add("defines", "_WIN64", "_AMD64_", "AMD64")