diff options
| author | 2026-04-08 17:14:05 +0700 | |
|---|---|---|
| committer | 2026-04-08 17:21:51 +0700 | |
| commit | f52420dfd9020ed60e3ebac971804e042c76c286 (patch) | |
| tree | c46c22b01ce4e14e8b361e861e5e5eec4bc4a415 /scripts | |
| parent | 7ad8ac090ce2102aa7af7f6587a43994d207c44a (diff) | |
build: retire superseded Intel C++ Compiler target
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/genie.lua | 43 | ||||
| -rwxr-xr-x | scripts/src/3rdparty.lua | 56 | ||||
| -rw-r--r-- | scripts/toolchain.lua | 8 |
3 files changed, 1 insertions, 106 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua index d9957789bce..67069c1dc97 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -1287,49 +1287,6 @@ if _OPTIONS["vs"]==nil then "Cpp20", "ExtraWarnings", } -elseif _OPTIONS["vs"]=="intel-15" then - buildoptions { - "/bigobj", - } - - buildoptions { - "/Qwd9", -- remark #9: nested comment is not allowed - "/Qwd82", -- remark #82: storage class is not first - "/Qwd111", -- remark #111: statement is unreachable - "/Qwd128", -- remark #128: loop is not reachable - "/Qwd177", -- remark #177: function "xxx" was declared but never referenced - "/Qwd181", -- remark #181: argument of type "UINT32={unsigned int}" is incompatible with format "%d", expecting argument of type "int" - "/Qwd185", -- remark #185: dynamic initialization in unreachable code - "/Qwd280", -- remark #280: selector expression is constant - "/Qwd344", -- remark #344: typedef name has already been declared (with same type) - "/Qwd411", -- remark #411: class "xxx" defines no constructor to initialize the following - "/Qwd869", -- remark #869: parameter "xxx" was never referenced - "/Qwd2545", -- remark #2545: empty dependent statement in "else" clause of if - statement - "/Qwd2553", -- remark #2553: nonstandard second parameter "TCHAR={WCHAR = { __wchar_t } } **" of "main", expected "char *[]" or "char **" extern "C" int _tmain(int argc, TCHAR **argv) - "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands - "/Qwd3280", -- remark #3280: declaration hides member "attotime::seconds" (declared at line 126) static attotime from_seconds(INT32 seconds) { return attotime(seconds, 0); } - - "/Qwd170", -- error #170: pointer points outside of underlying object - "/Qwd188", -- error #188: enumerated type mixed with another type - - "/Qwd63", -- warning #63: shift count is too large - "/Qwd177", -- warning #177: label "xxx" was declared but never referenced - "/Qwd186", -- warning #186: pointless comparison of unsigned integer with zero - "/Qwd488", -- warning #488: template parameter "_FunctionClass" is not used in declaring the parameter types of function template "device_delegate<_Signature>::device_delegate<_FunctionClass>(delegate<_Signature>: - "/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated - "/Qwd1879", -- warning #1879: unimplemented pragma ignored - "/Qwd3291", -- warning #3291: invalid narrowing conversion from "double" to "int" - "/Qwd1195", -- error #1195: conversion from integer to smaller pointer - "/Qwd47", -- error #47: incompatible redefinition of macro "xxx" - "/Qwd265", -- error #265: floating-point operation result is out of range - -- these occur on a release build, while we can increase the size limits instead some of the files do require extreme amounts - "/Qwd11074", -- remark #11074: Inlining inhibited by limit max-size / remark #11074: Inlining inhibited by limit max-total-size - "/Qwd11075", -- remark #11075: To get full report use -Qopt-report:4 -Qopt-report-phase ipo - } - - flags { - "ExtraWarnings", - } elseif _OPTIONS["vs"]=="clangcl" then buildoptions { "-Wno-ignored-qualifiers", diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 29f1b1c0942..f89b9625917 100755 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -82,13 +82,6 @@ if _OPTIONS["vs"]==nil then "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration } -elseif _OPTIONS["vs"]=="intel-15" then - buildoptions { - "/Qwd111", -- remark #111: statement is unreachable - "/Qwd1879", -- warning #1879: unimplemented pragma ignored - "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands - "/Qwd869", -- remark #869: parameter "xxx" was never referenced - } end configuration { "gmake or ninja" } @@ -147,11 +140,6 @@ if _OPTIONS["vs"]==nil then "/wd4127", -- warning C4127: conditional expression is constant "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data } -elseif _OPTIONS["vs"]=="intel-15" then - buildoptions { - "/Qwd111", -- remark #111: statement is unreachable - "/Qwd280", -- remark #280: selector expression is constant - } end configuration "Debug" defines { @@ -275,10 +263,6 @@ if _OPTIONS["vs"]==nil then "/wd4146", -- warning C4146: unary minus operator applied to unsigned type, result still unsigned "/wd4018", -- warning C4018: 'x' : signed/unsigned mismatch } -elseif _OPTIONS["vs"]=="intel-15" then - buildoptions { - "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands - } end configuration { } @@ -673,10 +657,6 @@ if _OPTIONS["vs"]==nil then "/wd4127", -- warning C4127: conditional expression is constant "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data } -elseif _OPTIONS["vs"]=="intel-15" then - buildoptions { - "/Qwd869", -- remark #869: parameter "xxx" was never referenced - } end configuration { } @@ -755,14 +735,6 @@ if _OPTIONS["vs"]==nil then "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration "/wd4702", -- warning C4702: unreachable code } -elseif _OPTIONS["vs"]=="intel-15" then - buildoptions { - "/Qwd111", -- remark #111: statement is unreachable - "/Qwd177", -- remark #177: function "xxx" was declared but never referenced - "/Qwd181", -- remark #181: argument of type "UINT32={unsigned int}" is incompatible with format "%d", expecting argument of type "int" - "/Qwd188", -- error #188: enumerated type mixed with another type - "/Qwd869", -- remark #869: parameter "xxx" was never referenced - } end configuration { "mingw*" } @@ -916,10 +888,6 @@ if _OPTIONS["vs"]==nil then "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration "/wd4457", -- warning C4457: declaration of 'xxx' hides function parameter } -elseif _OPTIONS["vs"]=="intel-15" then - buildoptions { - "/Qwd869", -- remark #869: parameter "xxx" was never referenced - } end configuration { } defines { @@ -1005,10 +973,6 @@ if _OPTIONS["vs"]==nil then "/wd4702", -- warning C4702: unreachable code "/wd4310", -- warning C4310: cast truncates constant value } -elseif _OPTIONS["vs"]=="intel-15" then - buildoptions { - "/Qwd592", -- error #592: variable "xxx" is used before its value is set - } end configuration { } @@ -1197,13 +1161,6 @@ if _OPTIONS["vs"]==nil then "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration "/wd4706", -- warning C4706: assignment within conditional expression } -elseif _OPTIONS["vs"]=="intel-15" then - buildoptions { - "/Qwd188", -- error #188: enumerated type mixed with another type - "/Qwd344", -- remark #344: typedef name has already been declared (with same type) - "/Qwd869", -- remark #869: parameter "xxx" was never referenced - "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands - } elseif _OPTIONS["vs"]=="clangcl" then buildoptions { "-Wno-unused-but-set-variable", @@ -1505,12 +1462,6 @@ if _OPTIONS["vs"]==nil then "/wd4310", -- warning C4310: cast truncates constant value "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used } -elseif _OPTIONS["vs"]=="intel-15" then - buildoptions { - "/Qwd906", -- message #906: effect of this "#pragma pack" directive is local to function "xxx" - "/Qwd1879", -- warning #1879: unimplemented pragma ignored - "/Qwd82", -- remark #82: storage class is not first - } elseif _OPTIONS["vs"]=="clangcl" then buildoptions { "-Wno-uninitialized", @@ -1707,13 +1658,6 @@ if _OPTIONS["vs"]==nil then "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used "/wd4057", -- warning C4057: 'function': 'xxx' differs in indirection to slightly different base types from 'xxx' } -elseif _OPTIONS["vs"]=="intel-15" then - buildoptions { - "/Qwd869", -- remark #869: parameter "xxx" was never referenced - "/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated - "/Qwd2544", -- message #2544: empty dependent statement in if-statement - "/Qwd1879", -- warning #1879: unimplemented pragma ignored - } elseif _OPTIONS["vs"]=="clangcl" then buildoptions { "-Wno-missing-braces", diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index d00f426ba9a..d0e4158c5e2 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -41,8 +41,7 @@ newoption { value = "toolset", description = "Choose VS toolset", allowed = { - { "intel-15", "Intel C++ Compiler XE 15.0" }, - { "clangcl", "Visual Studio 2019 using Clang/LLVM" }, + { "clangcl", "Visual Studio using Clang/LLVM" }, }, } @@ -207,11 +206,6 @@ function toolchain(_buildDir, _subDir) premake.vstudio.toolset = ("ClangCL") location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-clang") end - - if "intel-15" == _OPTIONS["vs"] then - premake.vstudio.toolset = "Intel C++ Compiler XE 15.0" - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-intel") - end end if (_OPTIONS["CC"] ~= nil) then |
