summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-06-17 20:44:19 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-06-17 20:44:51 (GMT)
commit0328d98d29b383ecfcb5ffb66df0a9b7b4d85654 (patch)
tree99743aec22fe14720acc55c685b02c17b8b745b1
parent005c59b39500b0b1cb9a0917325a3de7dbc41760 (diff)
downloadswift-0328d98d29b383ecfcb5ffb66df0a9b7b4d85654.zip
swift-0328d98d29b383ecfcb5ffb66df0a9b7b4d85654.tar.bz2
Fixed build for Mac OS X 10.5.
-rw-r--r--BuildTools/SCons/SConstruct3
-rw-r--r--Swiften/SConscript1
2 files changed, 4 insertions, 0 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index 2ad78d8..d2ffeb3 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -638,6 +638,9 @@ if use_openssl and openssl_conf.CheckCHeader("openssl/ssl.h") :
env["OPENSSL_FLAGS"]["LIBS"] = ["libeay32MD", "ssleay32MD"]
else:
env["OPENSSL_FLAGS"]["LIBS"] = ["ssl", "crypto"]
+ if env["PLATFORM"] == "darwin" :
+ if platform.mac_ver()[0].startswith("10.5") :
+ env["OPENSSL_FLAGS"]["FRAMEWORKS"] = ["Security"]
elif target in ("iphone-device", "iphone-simulator", "xcode") :
env["OPENSSL_BUNDLED"] = True
env["HAVE_OPENSSL"] = True
diff --git a/Swiften/SConscript b/Swiften/SConscript
index 90be7a2..d7bab26 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -49,6 +49,7 @@ if env["SCONS_STAGE"] == "flags" :
"CPPFLAGS": e.get("CPPFLAGS", []),
"LIBPATH": e.get("LIBPATH", []),
"LIBS": e.get("LIBS", []),
+ "FRAMEWORKS": e.get("FRAMEWORKS", []),
}
################################################################################