summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2013-02-12 21:50:33 (GMT)
committerRemko Tronçon <git@el-tramo.be>2013-02-12 21:50:33 (GMT)
commit330d8a6bcbeddc88a65622c03fd27cddde21a497 (patch)
tree1bf4f6f06753a792d6ff0d56825562a04c91232e /BuildTools/SCons
parent7f87312400f7c6fdb8744b5540fe76c5fb124873 (diff)
downloadswift-330d8a6bcbeddc88a65622c03fd27cddde21a497.zip
swift-330d8a6bcbeddc88a65622c03fd27cddde21a497.tar.bz2
Include frameworks in swiften-config.
Also remove duplicates from frameworks list. Change-Id: I769d3951677a180c90618dc6ae5b91d028c08e8a
Diffstat (limited to 'BuildTools/SCons')
-rw-r--r--BuildTools/SCons/SConscript.boot10
1 files changed, 6 insertions, 4 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
index 567ff83..cf4ef6a 100644
--- a/BuildTools/SCons/SConscript.boot
+++ b/BuildTools/SCons/SConscript.boot
@@ -78,7 +78,11 @@ else :
Help(vars.GenerateHelpText(env))
# Default environment variables
-env["PLATFORM_FLAGS"] = {}
+env["PLATFORM_FLAGS"] = {
+ "LIBPATH": [],
+ "LIBS": [],
+ "FRAMEWORKS": [],
+}
# Default custom tools
env.Tool("Test", toolpath = ["#/BuildTools/SCons/Tools"])
@@ -195,7 +199,6 @@ if env.get("mac105", 0) :
"-mmacosx-version-min=10.5",
"-isysroot", "/Developer/SDKs/MacOSX10.5.sdk",
"-arch", "i386"])
- env.Append(FRAMEWORKS = ["Security"])
if env.get("mac106", 0) :
assert(env["PLATFORM"] == "darwin")
env.Append(CCFLAGS = [
@@ -205,7 +208,6 @@ if env.get("mac106", 0) :
"-mmacosx-version-min=10.6",
"-isysroot", "/Developer/SDKs/MacOSX10.6.sdk",
"-arch", "i386"])
- env.Append(FRAMEWORKS = ["Security"])
if not env["assertions"] :
env.Append(CPPDEFINES = ["NDEBUG"])
@@ -257,7 +259,7 @@ if env["PLATFORM"] == "win32" :
env["SHLINKCOM"] = [env["SHLINKCOM"], 'mt.exe -nologo -manifest ${TARGET}.manifest -outputresource:$TARGET;2']
if env["PLATFORM"] == "darwin" and not env["target"] in ["iphone-device", "iphone-simulator", "xcode"] :
- env.Append(FRAMEWORKS = ["IOKit", "AppKit", "SystemConfiguration", "Security", "SecurityInterface"])
+ env["PLATFORM_FLAGS"]["FRAMEWORKS"] += ["IOKit", "AppKit", "SystemConfiguration", "Security", "SecurityInterface"]
# Testing
env["TEST_TYPE"] = env["test"]