Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2016-03-18 15:43:18 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-03-31 06:51:52 (GMT) |
| commit | 1d545a4a7fb877f021508094b88c1f17b30d8b4e (patch) | |
| tree | 1c291a248481b6edd9a2e4470e1fd56fd821474e /Swiften | |
| parent | 5de19b60ae5593adbc3d913f9c64162e21bc702a (diff) | |
| download | swift-1d545a4a7fb877f021508094b88c1f17b30d8b4e.zip swift-1d545a4a7fb877f021508094b88c1f17b30d8b4e.tar.bz2 | |
Stop building some TLS providers as always static
Thanks to Manfred Urban for reporting that dynamic libraries weren't working.
Test-Information:
Swiften Builds on OS X with swiften_dll=True
Change-Id: I31e40ac118b9be6b43803a2bbcbfef3a9f9f9d21
Diffstat (limited to 'Swiften')
| -rw-r--r-- | Swiften/TLS/SConscript | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Swiften/TLS/SConscript b/Swiften/TLS/SConscript index f5eb053..c1ff425 100644 --- a/Swiften/TLS/SConscript +++ b/Swiften/TLS/SConscript @@ -20,7 +20,7 @@ if myenv.get("HAVE_OPENSSL", 0) : myenv.Append(CPPDEFINES = "HAVE_OPENSSL") elif myenv.get("HAVE_SCHANNEL", 0) : swiften_env.Append(LIBS = ["Winscard"]) - objects += myenv.StaticObject([ + objects += myenv.SwiftenObject([ "CAPICertificate.cpp", "Schannel/SchannelContext.cpp", "Schannel/SchannelCertificate.cpp", @@ -29,7 +29,7 @@ elif myenv.get("HAVE_SCHANNEL", 0) : myenv.Append(CPPDEFINES = "HAVE_SCHANNEL") elif myenv.get("HAVE_SECURETRANSPORT", 0) : #swiften_env.Append(LIBS = ["Winscard"]) - objects += myenv.StaticObject([ + objects += myenv.SwiftenObject([ "SecureTransport/SecureTransportContext.mm", "SecureTransport/SecureTransportCertificate.mm", "SecureTransport/SecureTransportContextFactory.cpp", @@ -38,6 +38,4 @@ elif myenv.get("HAVE_SECURETRANSPORT", 0) : objects += myenv.SwiftenObject(["PlatformTLSFactories.cpp"]) - - swiften_env.Append(SWIFTEN_OBJECTS = [objects]) |