summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/toolchain.lua
diff options
context:
space:
mode:
author Julian Sikorski <belegdol+github@gmail.com>2019-10-02 06:30:05 +0200
committer Vas Crabb <cuavas@users.noreply.github.com>2019-10-02 14:30:05 +1000
commitfc31772d537941104ca810fbc3b5a13584c88835 (patch)
treec0c1e106a5d687074d2b775e64c0fab4de2ca4a9 /scripts/toolchain.lua
parent5707a77cfe11eba057de128b6844a671753ccc3d (diff)
vs2019 fixes, initial clang-cl support (#5698)
* Add initial clangcl support * Fix uwp builds' vs version typos * Add missing vs2019 toolchain.lua bits
Diffstat (limited to 'scripts/toolchain.lua')
-rw-r--r--scripts/toolchain.lua28
1 files changed, 28 insertions, 0 deletions
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index e596c06bfb0..14ab17b4d8f 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -55,6 +55,7 @@ newoption {
{ "vs2015-xp", "Visual Studio 2015 targeting XP" },
{ "vs2017-clang", "Clang 3.6" },
{ "vs2017-xp", "Visual Studio 2017 targeting XP" },
+ { "clangcl", "Visual Studio 2019 using Clang/LLVM" },
{ "winphone8", "Windows Phone 8.0" },
{ "winphone81", "Windows Phone 8.1" },
{ "winstore81", "Windows Store 8.1" },
@@ -452,6 +453,33 @@ function toolchain(_buildDir, _subDir)
premake.vstudio.toolset = ("v141_xp")
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-xp")
end
+ elseif _ACTION == "vs2019" or _ACTION == "vs2019-fastbuild" then
+
+ if "clangcl" == _OPTIONS["vs"] then
+ premake.vstudio.toolset = ("ClangCL")
+ location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-clang")
+ end
+
+ if "winstore82" == _OPTIONS["vs"] then
+ premake.vstudio.toolset = "v142"
+ premake.vstudio.storeapp = "10.0"
+
+ -- If needed, depending on GENie version, enable file-level configuration
+ if enablefilelevelconfig ~= nil then
+ enablefilelevelconfig()
+ end
+
+ local action = premake.action.current()
+ action.vstudio.windowsTargetPlatformVersion = windowsPlatform
+
+ platforms { "ARM" }
+ location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winstore82")
+ end
+
+ if "intel-15" == _OPTIONS["vs"] then
+ premake.vstudio.toolset = "Intel C++ Compiler XE 15.0"
+ location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-intel")
+ end
elseif _ACTION == "xcode4" then