diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/genie.lua | 23 | ||||
-rw-r--r-- | scripts/toolchain.lua | 28 |
2 files changed, 51 insertions, 0 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua index 707fc4d1d79..734508a04f2 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -1443,6 +1443,29 @@ if _OPTIONS["vs"]=="intel-15" then } end +if _OPTIONS["vs"]=="clangcl" then + buildoptions { + "-Wno-enum-conversion", + "-Wno-ignored-qualifiers", + "-Wno-missing-braces", + "-Wno-missing-field-initializers", + "-Wno-new-returns-null", + "-Wno-nonportable-include-path", + "-Wno-pointer-bool-conversion", + "-Wno-pragma-pack", + "-Wno-switch", + "-Wno-tautological-constant-out-of-range-compare", + "-Wno-tautological-pointer-compare", + "-Wno-unknown-warning-option", + "-Wno-unused-const-variable", + "-Wno-unused-function", + "-Wno-unused-label", + "-Wno-unused-local-typedef", + "-Wno-unused-private-field", + "-Wno-unused-variable", + } +end + linkoptions { "/ignore:4221", -- LNK4221: This object file does not define any previously undefined public symbols, so it will not be used by any link operation that consumes this library } 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 |