Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-03-16 20:26:53 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-03-16 20:26:53 (GMT) |
| commit | 2feadc01a56269094e6c533ca23b4357b65ab2a9 (patch) | |
| tree | 6ad254cfbdce462df5bcb7baab0000a1b1e0fafb /Swiften/Config/SConscript | |
| parent | c019d185626f6e9220f139a6e0d5543d1fc97f09 (diff) | |
| download | swift-contrib-2feadc01a56269094e6c533ca23b4357b65ab2a9.zip swift-contrib-2feadc01a56269094e6c533ca23b4357b65ab2a9.tar.bz2 | |
Some more Swiften packaging improvements & fixes.
Diffstat (limited to 'Swiften/Config/SConscript')
| -rw-r--r-- | Swiften/Config/SConscript | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Swiften/Config/SConscript b/Swiften/Config/SConscript index 933e4a3..357a5e6 100644 --- a/Swiften/Config/SConscript +++ b/Swiften/Config/SConscript @@ -27,11 +27,13 @@ libflags = replaceSwiftenPath(" ".join([swiften_env.subst("$_LIBDIRFLAGS"), swif config_flags += cStringVariable(swiften_env, "LIBFLAGS", libflags) config_env = env.Clone() -config_env.MergeFlags(config_env["SWIFTEN_FLAGS"]) +# Create a local copy of Paths.cpp to avoid a Swiften dependency +config_env.Install(".", "#/Swiften/Base/Paths.cpp") config_env.MergeFlags(config_env["BOOST_FLAGS"]) config_env.MergeFlags(config_env["PLATFORM_FLAGS"]) config_env.WriteVal("swiften-config.h", config_env.Value(config_flags)) swiften_config = config_env.Program("swiften-config", [ + "Paths.cpp", "swiften-config.cpp" ]) |