Mirrors/bx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bx.git synced 2026-02-17 20:52:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated toolchain for specifying Windows SDK version. Issue #147.

Browse Source
This commit is contained in:
Branimir Karadžić
2017-04-14 21:24:55 -07:00
parent 7d49758e07
commit 010b472f69
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/toolchain.lua
View File

@@ -135,7 +135,7 @@ function toolchain(_buildDir, _libDir)
newoption {
trigger = "with-windows",
value = "#",
description = "Set the Windows target platform version (default: 10.0.10240.0).",
description = "Set the Windows target platform version (default: $WindowsSDKVersion or 8.1).",
}
newoption {
@@ -179,7 +179,7 @@ function toolchain(_buildDir, _libDir)
tvosPlatform = _OPTIONS["with-tvos"]
end
local windowsPlatform = "10.0.10240.0"
local windowsPlatform = os.getenv("WindowsSDKVersion") or "8.1"
if _OPTIONS["with-windows"] then
windowsPlatform = _OPTIONS["with-windows"]
end
@@ -458,6 +458,10 @@ function toolchain(_buildDir, _libDir)
or _ACTION == "vs2017"
then
local action = premake.action.current()
action.vstudio.windowsTargetPlatformVersion = windowsPlatform
action.vstudio.windowsTargetPlatformMinVersion = windowsPlatform
if (_ACTION .. "-clang") == _OPTIONS["vs"] then
if "vs2017-clang" == _OPTIONS["vs"] then
premake.vstudio.toolset = "v141_clang_c2"
@@ -488,10 +492,6 @@ function toolchain(_buildDir, _libDir)
premake.vstudio.toolset = "v140"
premake.vstudio.storeapp = "8.2"
local action = premake.action.current()
action.vstudio.windowsTargetPlatformVersion = windowsPlatform
action.vstudio.windowsTargetPlatformMinVersion = windowsPlatform
platforms { "ARM" }
location (path.join(_buildDir, "projects", _ACTION .. "-winstore82"))