summaryrefslogtreecommitdiffstats
path: root/docs/release/scripts/toolchain.lua
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2019-10-29 10:49:22 +1100
committer Robbbert <Robbbert@users.noreply.github.com>2019-10-29 10:49:22 +1100
commite4ee887d5cdffb6767e1078fe9dca32d7c920f2e (patch)
tree1c3ecc61329eae8cbad23cf1d2ca03a01764f739 /docs/release/scripts/toolchain.lua
parent1e8a03afab272a010763935b564c742155513797 (diff)
0.215 Release filestag215
Diffstat (limited to 'docs/release/scripts/toolchain.lua')
-rw-r--r--docs/release/scripts/toolchain.lua31
1 files changed, 31 insertions, 0 deletions
diff --git a/docs/release/scripts/toolchain.lua b/docs/release/scripts/toolchain.lua
index e596c06bfb0..79e3f84e17f 100644
--- a/docs/release/scripts/toolchain.lua
+++ b/docs/release/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
@@ -672,6 +700,9 @@ function toolchain(_buildDir, _subDir)
targetdir (_buildDir .. "ci20/bin/Debug")
configuration { "mingw-clang" }
+ buildoptions {
+ "-femulated-tls",
+ }
linkoptions {
"-Wl,--allow-multiple-definition",
}