Swiftdiff options
Diffstat (limited to 'Slimber')
| -rw-r--r-- | Slimber/CLI/SConscript | 18 | ||||
| -rw-r--r-- | Slimber/Qt/SConscript | 19 |
2 files changed, 19 insertions, 18 deletions
diff --git a/Slimber/CLI/SConscript b/Slimber/CLI/SConscript index 422b56c..04e4976 100644 --- a/Slimber/CLI/SConscript +++ b/Slimber/CLI/SConscript @@ -1,16 +1,16 @@ Import("env") myenv = env.Clone() +myenv.UseFlags(env["SLIMBER_FLAGS"]) myenv.UseFlags(env["LIMBER_FLAGS"]) -myenv.MergeFlags(env["SLIMBER_FLAGS"]) -myenv.MergeFlags(env["SWIFTOOLS_FLAGS"]) -myenv.MergeFlags(env["SWIFTEN_FLAGS"]) -myenv.MergeFlags(env["LIBIDN_FLAGS"]) -myenv.MergeFlags(env["BOOST_FLAGS"]) -myenv.MergeFlags(env.get("LIBXML_FLAGS", {})) -myenv.MergeFlags(env.get("EXPAT_FLAGS", {})) -myenv.MergeFlags(env.get("AVAHI_FLAGS", {})) -myenv.MergeFlags(myenv["PLATFORM_FLAGS"]) +myenv.UseFlags(env["SWIFTOOLS_FLAGS"]) +myenv.UseFlags(env["SWIFTEN_FLAGS"]) +myenv.UseFlags(env["LIBIDN_FLAGS"]) +myenv.UseFlags(env["BOOST_FLAGS"]) +myenv.UseFlags(env.get("LIBXML_FLAGS", {})) +myenv.UseFlags(env.get("EXPAT_FLAGS", {})) +myenv.UseFlags(env.get("AVAHI_FLAGS", {})) +myenv.UseFlags(myenv["PLATFORM_FLAGS"]) myenv.Program("slimber", [ "main.cpp", diff --git a/Slimber/Qt/SConscript b/Slimber/Qt/SConscript index c71d480..054d8b6 100644 --- a/Slimber/Qt/SConscript +++ b/Slimber/Qt/SConscript @@ -4,15 +4,16 @@ Import("env") myenv = env.Clone() myenv["CXXFLAGS"] = filter(lambda x : x != "-Wfloat-equal", myenv["CXXFLAGS"]) -myenv.MergeFlags(env["SLIMBER_FLAGS"]) -myenv.MergeFlags(env["SWIFTOOLS_FLAGS"]) -myenv.MergeFlags(env["SWIFTEN_FLAGS"]) -myenv.MergeFlags(env["LIBIDN_FLAGS"]) -myenv.MergeFlags(env["BOOST_FLAGS"]) -myenv.MergeFlags(env.get("LIBXML_FLAGS", "")) -myenv.MergeFlags(env.get("EXPAT_FLAGS", "")) -myenv.MergeFlags(env.get("AVAHI_FLAGS", "")) -myenv.MergeFlags(myenv["PLATFORM_FLAGS"]) +myenv.UseFlags(env["SLIMBER_FLAGS"]) +myenv.UseFlags(env["LIMBER_FLAGS"]) +myenv.UseFlags(env["SWIFTOOLS_FLAGS"]) +myenv.UseFlags(env["SWIFTEN_FLAGS"]) +myenv.UseFlags(env["LIBIDN_FLAGS"]) +myenv.UseFlags(env["BOOST_FLAGS"]) +myenv.UseFlags(env.get("LIBXML_FLAGS", "")) +myenv.UseFlags(env.get("EXPAT_FLAGS", "")) +myenv.UseFlags(env.get("AVAHI_FLAGS", "")) +myenv.UseFlags(myenv["PLATFORM_FLAGS"]) myenv.Tool("qt4", toolpath = ["#/BuildTools/SCons/Tools"]) myenv.Tool("nsis", toolpath = ["#/BuildTools/SCons/Tools"]) |