summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-09-16 08:18:53 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-09-16 08:18:53 (GMT)
commit2c7fb800745172e2d190d15e556fb59f3a930fa1 (patch)
tree68491462ee1766df463a370af4140fe45680ee98 /Swiften
parentea1d9d7517f6a14ffb9bbd71ade78603135e8c55 (diff)
downloadswift-contrib-2c7fb800745172e2d190d15e556fb59f3a930fa1.zip
swift-contrib-2c7fb800745172e2d190d15e556fb59f3a930fa1.tar.bz2
Start including some bundled libraries in Swiften library.
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/SConscript2
1 files changed, 2 insertions, 0 deletions
diff --git a/Swiften/SConscript b/Swiften/SConscript
index 7ad2a38..5546975 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -69,6 +69,8 @@ if env["SCONS_STAGE"] == "build" :
swiften_env.Append(CPPDEFINES = ["SWIFTEN_BUILDING"])
for module in swiften_dep_modules :
swiften_env.UseFlags(swiften_env.get(module + "_FLAGS", {}))
+ if env.get(module + "_BUNDLED", False) :
+ swiften_env.Append(SWIFTEN_OBJECTS = env.get(module + "_OBJECTS", []))
swiften_env.UseFlags(swiften_env["PLATFORM_FLAGS"])
if swiften_env["SWIFTEN_DLL"] :