diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index 445edab..74600df 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -84,13 +84,7 @@ function toolchain(_buildDir, _libDir) value = "toolset", description = "Choose VS toolset", allowed = { - { "vs2012-clang", "Clang 3.6" }, - { "vs2013-clang", "Clang 3.6" }, - { "vs2015-clang", "Clang 3.9" }, { "vs2017-clang", "Clang with MS CodeGen" }, - { "vs2012-xp", "Visual Studio 2012 targeting XP" }, - { "vs2013-xp", "Visual Studio 2013 targeting XP" }, - { "vs2015-xp", "Visual Studio 2015 targeting XP" }, { "vs2017-xp", "Visual Studio 2017 targeting XP" }, { "winstore100", "Universal Windows App 10.0" }, { "durango", "Durango" }, @@ -404,10 +398,7 @@ function toolchain(_buildDir, _libDir) location (path.join(_buildDir, "projects", _ACTION .. "-riscv")) end - elseif _ACTION == "vs2012" - or _ACTION == "vs2013" - or _ACTION == "vs2015" - or _ACTION == "vs2017" + elseif _ACTION == "vs2017" or _ACTION == "vs2019" or _ACTION == "vs2022" then @@ -421,8 +412,6 @@ function toolchain(_buildDir, _libDir) if (_ACTION .. "-clang") == _OPTIONS["vs"] then if "vs2017-clang" == _OPTIONS["vs"] then premake.vstudio.toolset = "v141_clang_c2" - elseif "vs2015-clang" == _OPTIONS["vs"] then - premake.vstudio.toolset = "LLVM-vs2014" else premake.vstudio.toolset = ("LLVM-" .. _ACTION) end @@ -453,22 +442,6 @@ function toolchain(_buildDir, _libDir) platforms { "Orbis" } location (path.join(_buildDir, "projects", _ACTION .. "-orbis")) - elseif ("vs2012-xp") == _OPTIONS["vs"] then - premake.vstudio.toolset = ("v110_xp") - location (path.join(_buildDir, "projects", _ACTION .. "-xp")) - - elseif "vs2013-xp" == _OPTIONS["vs"] then - premake.vstudio.toolset = ("v120_xp") - location (path.join(_buildDir, "projects", _ACTION .. "-xp")) - - elseif "vs2015-xp" == _OPTIONS["vs"] then - premake.vstudio.toolset = ("v140_xp") - location (path.join(_buildDir, "projects", _ACTION .. "-xp")) - - elseif "vs2015-xp" == _OPTIONS["vs"] then - premake.vstudio.toolset = ("v141_xp") - location (path.join(_buildDir, "projects", _ACTION .. "-xp")) - end elseif _ACTION and _ACTION:match("^xcode.+$") then @@ -538,9 +511,9 @@ function toolchain(_buildDir, _libDir) } targetsuffix "Release" - configuration { "qbs" } - flags { - "ExtraWarnings", + configuration { "*-clang" } + buildoptions { + "-Wno-tautological-constant-compare", } configuration { "vs*", "x32" } @@ -570,9 +543,6 @@ function toolchain(_buildDir, _libDir) "/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 } - configuration { "vs2008" } - includedirs { path.join(bxDir, "include/compat/msvc/pre1600") } - configuration { "x32", "vs*" } targetdir (path.join(_buildDir, "win32_" .. _ACTION, "bin")) objdir (path.join(_buildDir, "win32_" .. _ACTION, "obj"))