diff options
author | 2022-02-26 00:25:58 +1100 | |
---|---|---|
committer | 2022-02-26 00:25:58 +1100 | |
commit | a79ea2e9baf351d80452e3fc9f53be06c0bb8a58 (patch) | |
tree | 0d752f300238f3999508e137b07185e1c076325f /scripts/src | |
parent | 1281aa019f5175cc76ee3d51d2f56ea28f62aec7 (diff) | |
parent | 45b02a490f066feb186df56b83c5c19c5499bff5 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/3rdparty.lua | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 6060edb068a..0c6c03663f6 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -80,6 +80,18 @@ if _OPTIONS["vs"]=="intel-15" then "/Qwd869", -- remark #869: parameter "xxx" was never referenced } end + + configuration { "gmake or ninja" } +if _OPTIONS["gcc"]~=nil then + if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android") then + + else + buildoptions_c { + "-Wno-maybe-uninitialized", -- expat in GCC 11.1 + } + end +end + configuration { } files { @@ -104,7 +116,7 @@ project "zlib" kind "StaticLib" local version = str_to_version(_OPTIONS["gcc_version"]) - if _OPTIONS["gcc"]~=nil and ((string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android"))) then + if _OPTIONS["gcc"]~=nil and (string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android")) then configuration { "gmake or ninja" } if (version >= 30700) then buildoptions { @@ -961,17 +973,24 @@ project "sqlite3" uuid "5cb3d495-57ed-461c-81e5-80dc0857517d" kind "StaticLib" - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions_c { "-Wno-bad-function-cast", "-Wno-discarded-qualifiers", "-Wno-undef", "-Wno-unused-but-set-variable", } -if _OPTIONS["gcc"]~=nil and ((string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android"))) then +if _OPTIONS["gcc"]~=nil then + if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android") then buildoptions_c { "-Wno-incompatible-pointer-types-discards-qualifiers", } + else + buildoptions_c { + "-Wno-return-local-addr", -- sqlite3.c in GCC 10 + "-Wno-misleading-indentation", -- sqlite3.c in GCC 11.1 + } + end end configuration { "vs*" } if _OPTIONS["vs"]=="clangcl" then @@ -1186,7 +1205,7 @@ project "bimg" MAME_DIR .. "3rdparty/bx/include/compat/freebsd", } - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions { "-Wno-unused-but-set-variable", } |