diff options
author | 2017-03-30 08:36:15 +0200 | |
---|---|---|
committer | 2017-03-30 08:36:15 +0200 | |
commit | 3fff3faf6c6e45aefb6272c2e8432284f75a3d22 (patch) | |
tree | c3edb4604e4bd4f27dc17c357c91e07af0a8cc5e | |
parent | 01c732defa2ff7ef9512e121d541d2405b3c18cd (diff) |
proper fix (nw)
-rw-r--r-- | 3rdparty/bx/src/string.cpp | 7 | ||||
-rw-r--r-- | scripts/src/3rdparty.lua | 9 |
2 files changed, 8 insertions, 8 deletions
diff --git a/3rdparty/bx/src/string.cpp b/3rdparty/bx/src/string.cpp index 03c47096d32..dbb59e5090a 100644 --- a/3rdparty/bx/src/string.cpp +++ b/3rdparty/bx/src/string.cpp @@ -5,14 +5,7 @@ #include <bx/allocator.h> #include <bx/hash.h> -#ifdef __GNUC__ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wstrict-overflow" -#endif #include <bx/readerwriter.h> -#ifdef __GNUC__ -#pragma GCC diagnostic pop -#endif #include <bx/string.h> #if !BX_CRT_NONE diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 242b2b2eb7f..d80c334999b 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -768,7 +768,14 @@ project "bx" includedirs { MAME_DIR .. "3rdparty/bx/include/compat/freebsd", } - + + if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "gcc") then + configuration { "linux*" } + buildoptions { + "-Wno-strict-overflow", + } + end + configuration { } includedirs { |