diff options
author | 2020-04-29 18:39:17 +1000 | |
---|---|---|
committer | 2020-04-29 18:39:17 +1000 | |
commit | d878d4649820232f4ffc44138c82a10c8a893d16 (patch) | |
tree | 100e15adc6a61c86f13e9b53ef7cb78bdf4949c5 /docs/release/scripts/src/3rdparty.lua | |
parent | 30fa9edfb904c948640f3226fa5e70b9fe1e5c34 (diff) |
0.221 Release filestag221
Diffstat (limited to 'docs/release/scripts/src/3rdparty.lua')
-rw-r--r-- | docs/release/scripts/src/3rdparty.lua | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/docs/release/scripts/src/3rdparty.lua b/docs/release/scripts/src/3rdparty.lua index 1ea65fa45d7..67a138b530b 100644 --- a/docs/release/scripts/src/3rdparty.lua +++ b/docs/release/scripts/src/3rdparty.lua @@ -717,6 +717,11 @@ project "7z" "-Wno-undef", "-Wno-strict-prototypes", } +if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") and str_to_version(_OPTIONS["gcc_version"]) >= 100000 then + buildoptions_c { + "-Wno-misleading-indentation", + } +end configuration { "mingw*" } buildoptions_c { @@ -729,6 +734,11 @@ project "7z" "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration "/wd4457", -- warning C4457: declaration of 'xxx' hides function parameter } +if _OPTIONS["vs"]=="clangcl" then + buildoptions { + "-Wno-misleading-indentation", + } +end if _OPTIONS["vs"]=="intel-15" then buildoptions { "/Qwd869", -- remark #869: parameter "xxx" was never referenced @@ -980,6 +990,12 @@ if _OPTIONS["gcc"]~=nil and ((string.find(_OPTIONS["gcc"], "clang") or string.fi "-Wno-incompatible-pointer-types-discards-qualifiers", } end + configuration { "vs*" } +if _OPTIONS["vs"]=="clangcl" then + buildoptions { + "-Wno-implicit-int-float-conversion", + } +end configuration { "winstore*" } defines { "SQLITE_OS_WINRT", @@ -1507,6 +1523,11 @@ project "portaudio" } end end + if string.find(_OPTIONS["gcc"], "clang") and version >= 100000 then + buildoptions_c { + "-Wno-misleading-indentation", + } + end end configuration { "vs*" } buildoptions { |