From 0328d98d29b383ecfcb5ffb66df0a9b7b4d85654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Remko=20Tron=C3=A7on?= Date: Fri, 17 Jun 2011 22:44:19 +0200 Subject: Fixed build for Mac OS X 10.5. 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", []), } ################################################################################ -- cgit v0.10.2-6-g49f6