summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2013-02-12 21:50:33 (GMT)
committerRemko Tronçon <git@el-tramo.be>2013-02-12 21:50:33 (GMT)
commit330d8a6bcbeddc88a65622c03fd27cddde21a497 (patch)
tree1bf4f6f06753a792d6ff0d56825562a04c91232e /Swiften
parent7f87312400f7c6fdb8744b5540fe76c5fb124873 (diff)
downloadswift-330d8a6bcbeddc88a65622c03fd27cddde21a497.zip
swift-330d8a6bcbeddc88a65622c03fd27cddde21a497.tar.bz2
Include frameworks in swiften-config.
Also remove duplicates from frameworks list. Change-Id: I769d3951677a180c90618dc6ae5b91d028c08e8a
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/Config/SConscript8
1 files changed, 7 insertions, 1 deletions
diff --git a/Swiften/Config/SConscript b/Swiften/Config/SConscript
index c7ec32e..691e9e5 100644
--- a/Swiften/Config/SConscript
+++ b/Swiften/Config/SConscript
@@ -23,7 +23,13 @@ swiften_env.UseFlags(swiften_env["SWIFTEN_DEP_FLAGS"])
cppflags = replaceSwiftenPath(" ".join([swiften_env.subst("$_CPPDEFFLAGS"), swiften_env.subst("$_CPPINCFLAGS")]))
config_flags += cStringVariable(swiften_env, "CPPFLAGS", cppflags)
-libflags = replaceSwiftenPath(" ".join([swiften_env.subst("$_LIBDIRFLAGS"), swiften_env.subst("$_LIBFLAGS")]))
+libflags = replaceSwiftenPath(" ".join([
+ swiften_env.subst("$_LIBDIRFLAGS"),
+ swiften_env.subst("$_LIBFLAGS"),
+ swiften_env.subst("$_FRAMEWORKPATH"),
+ swiften_env.subst("$_FRAMEWORKS"),
+ swiften_env.subst("$_FRAMEWORKSFLAGS")
+ ]))
config_flags += cStringVariable(swiften_env, "LIBFLAGS", libflags)
config_env = env.Clone()