summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-08-06 14:20:16 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-08-06 14:20:16 +0200
commit3917850b6197950e5671f4d3b9cb0b9c921b798d (patch)
tree503b9690868a7c238ba10d73b5c6bece7ca8c338 /scripts/src
parent057474989c1a92e9e935dbc8cb9d233ba3a4ea3a (diff)
Update BX and BGFX (nw)
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/3rdparty.lua11
1 files changed, 9 insertions, 2 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index e3c29933220..2dacc9b8b81 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -735,8 +735,16 @@ end
configuration { }
+ local version = str_to_version(_OPTIONS["gcc_version"])
+ if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "gcc") then
+ if version >= 60000 then
+ buildoptions_cpp {
+ "-Wno-misleading-indentation",
+ }
+ end
+ end
+
if _OPTIONS["targetos"]=="windows" then
- local version = str_to_version(_OPTIONS["gcc_version"])
if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then
buildoptions {
"-Wno-unknown-attributes",
@@ -747,7 +755,6 @@ end
end
if _OPTIONS["targetos"]=="macosx" then
- local version = str_to_version(_OPTIONS["gcc_version"])
if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then
buildoptions {
"-Wno-switch",