diff options
author | 2019-03-25 22:44:58 +0100 | |
---|---|---|
committer | 2019-03-25 22:44:58 +0100 | |
commit | c24473ddff715ecec2e258a6eb38960cf8c8e98e (patch) | |
tree | 8ea44b6396a6129913c0aac13859b5de9965e972 /scripts/src/3rdparty.lua | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'scripts/src/3rdparty.lua')
-rw-r--r-- | scripts/src/3rdparty.lua | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 2ccfa749e19..2a31b4ee392 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -633,6 +633,12 @@ end "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration } + configuration { "vsllvm" } + buildoptions { + "-Wno-unused-function", + "-Wno-enum-conversion", + } + configuration { } defines { "WORDS_BIGENDIAN=0", @@ -970,6 +976,12 @@ end "SQLITE_OS_WINRT", } + configuration { "vsllvm" } + buildoptions { + "-Wno-deprecated-declarations", + "-Wno-unused-variable", + } + configuration { } files { @@ -1216,6 +1228,13 @@ project "bgfx" "/wd4611", -- warning C4611: interaction between '_setjmp' and C++ object destruction is non-portable "/wd4310", -- warning C4310: cast truncates constant value } + + configuration { "vsllvm" } + buildoptions { + "-Wno-unneeded-internal-declaration", + "-Wno-unused-const-variable", + } + if _OPTIONS["vs"]=="intel-15" then buildoptions { "/Qwd906", -- message #906: effect of this "#pragma pack" directive is local to function "xxx" @@ -1389,6 +1408,15 @@ project "portaudio" "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration } + configuration { "vsllvm" } + buildoptions { + "-Wno-deprecated-declarations", + "-Wno-missing-braces", + "-Wno-unused-variable", + "-Wno-switch", + "-Wno-unused-function", + } + configuration { "gmake or ninja" } buildoptions_c { "-Wno-strict-prototypes", |