summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2012-08-30 18:56:46 (GMT)
committerTobias Markmann <tm@ayena.de>2012-08-30 18:56:46 (GMT)
commit49aa0ddd615ac5694cec69e380ce3773a1fe32ed (patch)
tree63714caffacba172f3e71724d7d145a525b31ad9 /Swift
parent6856199274e9c5e581220fccf520b8f011519d17 (diff)
downloadswift-contrib-49aa0ddd615ac5694cec69e380ce3773a1fe32ed.zip
swift-contrib-49aa0ddd615ac5694cec69e380ce3773a1fe32ed.tar.bz2
Dummy SecureTransport TLS backend. Mostly scons integration fail.tobias/cocoa-ssl
Diffstat (limited to 'Swift')
-rw-r--r--Swift/QtUI/SConscript4
-rw-r--r--Swift/SConscript2
2 files changed, 5 insertions, 1 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 064faab..1b22d49 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -65,6 +65,10 @@ if env["PLATFORM"] == "win32" :
if env["debug"] :
myenv.Append(LINKFLAGS = ["/NODEFAULTLIB:msvcrt"])
+if env["PLATFORM"] == "darwin" :
+ if myenv.get("HAVE_SECURETRANSPORT") :
+ myenv.Append(CPPDEFINES = "HAVE_SECURETRANSPORT")
+
myenv.WriteVal("DefaultTheme.qrc", myenv.Value(generateDefaultTheme(myenv.Dir("#/Swift/resources/themes/Default"))))
sources = [
diff --git a/Swift/SConscript b/Swift/SConscript
index cee3a74..0d0b350 100644
--- a/Swift/SConscript
+++ b/Swift/SConscript
@@ -5,7 +5,7 @@ Import("env")
SConscript("Controllers/SConscript")
if env["SCONS_STAGE"] == "build" :
- if not GetOption("help") and not env.get("HAVE_OPENSSL", 0) and not env.get("HAVE_SCHANNEL", 0) :
+ if not GetOption("help") and not env.get("HAVE_OPENSSL", 0) and not env.get("HAVE_SCHANNEL", 0) and not env.get("HAVE_SECURETRANSPORT", 0):
print "Error: Swift requires OpenSSL support, and OpenSSL was not found."
if "Swift" in env["PROJECTS"] :
env["PROJECTS"].remove("Swift")