summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2013-11-03 09:09:08 (GMT)
committerKevin Smith <git@kismith.co.uk>2013-11-03 09:09:08 (GMT)
commit3bc61625ba94ff532ef02de7872a4cf49be49d59 (patch)
treef05c8bc2aa015763c5c96dd7d1c5a199152e1fcc /BuildTools/SCons/SConstruct
parent2eb088cc2b0e26780359fc55993d656bb54b1882 (diff)
downloadswift-3bc61625ba94ff532ef02de7872a4cf49be49d59.zip
swift-3bc61625ba94ff532ef02de7872a4cf49be49d59.tar.bz2
Split experimental File Transfer out from History and Whiteboarding.
Effectively disables whiteboarding and history in default builds so we can avoid having to do a full cleanup of them for 3.0. File transfer remains enabled in default builds as we're intending getting that ready and shipping it. Change-Id: I8c1dcc989f238b58d6d7c426485e7cf582514d8f
Diffstat (limited to 'BuildTools/SCons/SConstruct')
-rw-r--r--BuildTools/SCons/SConstruct4
1 files changed, 2 insertions, 2 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index ce78d03..9eeaabe 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -351,7 +351,7 @@ else :
env["UNBOUND_FLAGS"] = {}
# LibMiniUPnPc
-if env["experimental"] :
+if env["experimental_ft"] :
libminiupnpc_flags = {"CPPPATH": ["/usr/include/miniupnpc/"]}
libminiupnpc_conf_env = conf_env.Clone()
if env.get("libminiupnpc_libdir", None) :
@@ -372,7 +372,7 @@ else :
env["LIBMINIUPNPC_FLAGS"] = {}
# LibNATPMP
-if env["experimental"] :
+if env["experimental_ft"] :
libnatpmp_flags = {}
libnatpmp_conf_env = conf_env.Clone()
if env.get("libnatpmp_libdir", None) :