Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-06-18 11:28:51 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-06-18 11:28:51 (GMT) |
| commit | 94373e3eac30fe3c1ad5565f436fa3aad212a576 (patch) | |
| tree | a266ade20a6f22f179cd2c45dbe9f1651b7b850f | |
| parent | 03ac748794af0b8c732df6bd32fcdd4fc3a93d81 (diff) | |
| download | swift-94373e3eac30fe3c1ad5565f436fa3aad212a576.zip swift-94373e3eac30fe3c1ad5565f436fa3aad212a576.tar.bz2 | |
Fixed compilation of Slimber/Qt.
| -rw-r--r-- | Slimber/Qt/SConscript | 19 |
1 files changed, 10 insertions, 9 deletions
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"]) |