Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2011-11-03 18:52:03 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2011-11-03 20:54:36 (GMT) |
| commit | 7a26e76bd05283fcc329469d25a2640107966603 (patch) | |
| tree | 6aaab1a11cc344d5dd59302450ba70c350963847 /Swiften/TLS/SConscript | |
| parent | 7b0795215f601a9561dbedbed3af32dbe9aba032 (diff) | |
| download | swift-7a26e76bd05283fcc329469d25a2640107966603.zip swift-7a26e76bd05283fcc329469d25a2640107966603.tar.bz2 | |
Quick brush up after previous patch.
Includes:
Initial cleanup of SChannel code; compiling on non-Windows
Be willing to compile Swift with SChannel
Undo some (presumably accidental) OpenSSL changes
Where TLS doesn't support finish messages (SChannel), don't try -PLUS
Diffstat (limited to 'Swiften/TLS/SConscript')
| -rw-r--r-- | Swiften/TLS/SConscript | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Swiften/TLS/SConscript b/Swiften/TLS/SConscript index 225aa0a..a71a446 100644 --- a/Swiften/TLS/SConscript +++ b/Swiften/TLS/SConscript @@ -18,12 +18,13 @@ if myenv.get("HAVE_OPENSSL", 0) : "OpenSSL/OpenSSLContextFactory.cpp", ]) myenv.Append(CPPDEFINES = "HAVE_OPENSSL") -elif myenv["PLATFORM"] == "win32" : +elif myenv.get("HAVE_SCHANNEL", 0) : objects += myenv.StaticObject([ "Schannel/SchannelContext.cpp", "Schannel/SchannelCertificate.cpp", "Schannel/SchannelContextFactory.cpp", ]) + myenv.Append(CPPDEFINES = "HAVE_SCHANNEL") objects += myenv.SwiftenObject(["PlatformTLSFactories.cpp"]) |