summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-10-07 19:02:06 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-10-07 19:02:06 (GMT)
commitf17433cc4d1054dbae8002a1995e0b632e26124a (patch)
tree16170e72707a4a3013bc3c15ab214161b91eb421 /BuildTools
parenteb982771caed944f441967194df86ddbec21efde (diff)
downloadswift-f17433cc4d1054dbae8002a1995e0b632e26124a.zip
swift-f17433cc4d1054dbae8002a1995e0b632e26124a.tar.bz2
Remove system natpmp and libminiupnp checking completely.
Diffstat (limited to 'BuildTools')
-rw-r--r--BuildTools/SCons/SConstruct28
1 files changed, 14 insertions, 14 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index 448bdbd..a7b3c78 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -313,25 +313,25 @@ conf.Finish()
# LibMiniUPnPc
if env["experimental"] :
- libminiupnpc_conf_env = conf_env.Clone()
- conf = Configure(libminiupnpc_conf_env)
- if conf.CheckCHeader("miniupnpc.h") and conf.CheckLib(env["libminiupnpc_libname"]) :
- print "NOT IMPLEMENTED YET"
- else :
- env["LIBMINIUPNPC_BUNDLED"] = 1
- conf.Finish()
+ #libminiupnpc_conf_env = conf_env.Clone()
+ #conf = Configure(libminiupnpc_conf_env)
+ #if conf.CheckCHeader("miniupnpc.h") and conf.CheckLib(env["libminiupnpc_libname"]) :
+ # print "NOT IMPLEMENTED YET"
+ #else :
+ env["LIBMINIUPNPC_BUNDLED"] = 1
+ #conf.Finish()
else :
env["LIBMINIUPNPC_FLAGS"] = {}
# LibNATPMP
if env["experimental"] :
- libnatpmp_conf_env = conf_env.Clone()
- conf = Configure(libnatpmp_conf_env)
- if conf.CheckCHeader("natpmp.h") and conf.CheckLib(env["libnatpmp_libname"]) :
- print "NOT IMPLEMENTED YET"
- else :
- env["LIBNATPMP_BUNDLED"] = 1
- conf.Finish()
+ #libnatpmp_conf_env = conf_env.Clone()
+ #conf = Configure(libnatpmp_conf_env)
+ #if conf.CheckCHeader("natpmp.h") and conf.CheckLib(env["libnatpmp_libname"]) :
+ # print "NOT IMPLEMENTED YET"
+ #else :
+ env["LIBNATPMP_BUNDLED"] = 1
+ #conf.Finish()
else :
env["LIBNATPMP_FLAGS"] = {}