summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--BuildTools/SCons/SConstruct4
1 files changed, 3 insertions, 1 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index 5d6e6be..5f4a984 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -33,7 +33,7 @@ vars.Add(PathVariable("qt", "Qt location", "", PathVariable.PathAccept))
# Set up default build & configure environment
################################################################################
-env = Environment(CPPPATH = "#", ENV = {'PATH' : os.environ['PATH']}, variables = vars)
+env = Environment(CPPPATH = "#", ENV = {'PATH' : os.environ['PATH'], 'LD_LIBRARY_PATH' : os.environ["LD_LIBRARY_PATH"]}, variables = vars)
Help(vars.GenerateHelpText(env))
@@ -100,6 +100,8 @@ if env["warnings"] :
else :
env.Append(CCFLAGS = ["-W", "-Wall"])
#env.Append(CCFLAGS = ["-W", "-Wall", "-Wredundant-decls", "-pedantic", "-Wno-long-long", "-Woverloaded-virtual", "-Wundef", "-Wfloat-equal", "-Wold-style-cast"])
+ if env["CCVERSION"].split(".")[0] > 4 or onv["CCVERSION"].split(".")[1] >= 5 :
+ env.Append(CCFLAGS = ["-Wlogical-op"])
if env.get("coverage", 0) :
assert(env["PLATFORM"] != "win32")