summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-03-28 07:03:44 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2015-03-28 07:03:44 +0100
commitce5ccff643eb011334ea429727b32ec3edf68b31 (patch)
tree0e59d17733d95b794f7a36740a61de74a1ca7518
parentcf02c07fdabff8d685d0ba2ed7966ad6056ab1df (diff)
added NOWERROR support (nw)
-rw-r--r--makefile5
-rw-r--r--scripts/genie.lua15
2 files changed, 18 insertions, 2 deletions
diff --git a/makefile b/makefile
index ef691f928dc..1e5785999bb 100644
--- a/makefile
+++ b/makefile
@@ -275,6 +275,11 @@ endif
ifdef USE_BGFX
PARAMS+= --USE_BGFX=$(USE_BGFX)
endif
+
+ifdef NOWERROR
+PARAMS+= --NOWERROR=$(NOWERROR)
+endif
+
# extension for executables
EXE =
diff --git a/scripts/genie.lua b/scripts/genie.lua
index c179e5b5392..8ed2f8cc8d0 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -140,6 +140,11 @@ newoption {
}
newoption {
+ trigger = "NOWERROR",
+ description = "NOWERROR",
+}
+
+newoption {
trigger = "USE_BGFX",
description = "Use of BGFX.",
allowed = {
@@ -191,8 +196,14 @@ end
configuration { "vs*" }
flags {
"ExtraWarnings",
+ }
+ if _OPTIONS["NOWERROR"]==nil then
+ flags{
"FatalWarnings",
}
+ end
+
+
configuration { "Debug", "vs*" }
flags {
"Symbols",
@@ -440,11 +451,11 @@ end
}
-- add the error warning flag
- --ifndef NOWERROR
+if _OPTIONS["NOWERROR"]==nil then
buildoptions {
"-Werror",
}
-
+end
-- if we are optimizing, include optimization options
--ifneq ($(),0)