summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-03-16 18:46:51 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-03-16 18:46:51 (GMT)
commit9b55c094105cc2746dc5e4929d3b7c2cd0956a37 (patch)
treed5d67c4f61f3ec6372935d1314776c56d8767ebc /Swiften/TLS/SConscript
parent09f48b8434dbdc0d5f55a7f21a55e6ff21f4fa60 (diff)
downloadswift-contrib-9b55c094105cc2746dc5e4929d3b7c2cd0956a37.zip
swift-contrib-9b55c094105cc2746dc5e4929d3b7c2cd0956a37.tar.bz2
Added possibility to dynamically link Swiften.
Resolves: #798
Diffstat (limited to 'Swiften/TLS/SConscript')
-rw-r--r--Swiften/TLS/SConscript6
1 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/TLS/SConscript b/Swiften/TLS/SConscript
index 43f7db6..b5829d6 100644
--- a/Swiften/TLS/SConscript
+++ b/Swiften/TLS/SConscript
@@ -1,6 +1,6 @@
Import("swiften_env")
-objects = swiften_env.StaticObject([
+objects = swiften_env.SwiftenObject([
"Certificate.cpp",
"CertificateFactory.cpp",
"CertificateTrustChecker.cpp",
@@ -12,14 +12,14 @@ objects = swiften_env.StaticObject([
myenv = swiften_env.Clone()
if myenv.get("HAVE_OPENSSL", 0) :
myenv.MergeFlags(myenv["OPENSSL_FLAGS"])
- objects += myenv.StaticObject([
+ objects += myenv.SwiftenObject([
"OpenSSL/OpenSSLContext.cpp",
"OpenSSL/OpenSSLCertificate.cpp",
"OpenSSL/OpenSSLContextFactory.cpp",
])
myenv.Append(CPPDEFINES = "HAVE_OPENSSL")
-objects += myenv.StaticObject(["PlatformTLSFactories.cpp"])
+objects += myenv.SwiftenObject(["PlatformTLSFactories.cpp"])