Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2013-04-21 14:45:37 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2013-04-21 14:45:37 (GMT) |
| commit | 5eff3391c316d5ab325b78024296e74127c6747c (patch) | |
| tree | a86008521ec5d1b5704c76aae72545344536ad2b /Swiften/Network/SConscript | |
| parent | f5946a1273b363f46ae0753eccdf6bd96a72e997 (diff) | |
| download | swift-5eff3391c316d5ab325b78024296e74127c6747c.zip swift-5eff3391c316d5ab325b78024296e74127c6747c.tar.bz2 | |
Fix compilation when 3rdParty/ is not there.
Change-Id: I6d86bf7d8dcc750ff69ff08500c9987b3c1de43e
Diffstat (limited to 'Swiften/Network/SConscript')
| -rw-r--r-- | Swiften/Network/SConscript | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/Swiften/Network/SConscript b/Swiften/Network/SConscript index b742bfe..e0e5e63 100644 --- a/Swiften/Network/SConscript +++ b/Swiften/Network/SConscript @@ -72,20 +72,24 @@ else : objects = myenv.SwiftenObject(sourceList) -if myenv["experimental"] : +if myenv["experimental"] : # LibNATPMP classes - natpmp_env = myenv.Clone() - natpmp_env.Append(CPPDEFINES = natpmp_env["LIBNATPMP_FLAGS"].get("INTERNAL_CPPDEFINES", [])) - objects += natpmp_env.SwiftenObject([ - "NATPMPInterface.cpp", - ]) + if myenv.get("HAVE_LIBNATPMP", False) : + natpmp_env = myenv.Clone() + natpmp_env.Append(CPPDEFINES = natpmp_env["LIBNATPMP_FLAGS"].get("INTERNAL_CPPDEFINES", [])) + myenv.Append(CPPDEFINES = ["HAVE_LIBNATPMP"]) + objects += natpmp_env.SwiftenObject([ + "NATPMPInterface.cpp", + ]) # LibMINIUPnP classes - upnp_env = myenv.Clone() - upnp_env.Append(CPPDEFINES = upnp_env["LIBMINIUPNPC_FLAGS"].get("INTERNAL_CPPDEFINES", [])) - objects += upnp_env.SwiftenObject([ - "MiniUPnPInterface.cpp", - ]) + if myenv.get("HAVE_LIBMINIUPNPC", False) : + upnp_env = myenv.Clone() + upnp_env.Append(CPPDEFINES = upnp_env["LIBMINIUPNPC_FLAGS"].get("INTERNAL_CPPDEFINES", [])) + myenv.Append(CPPDEFINES = ["HAVE_LIBMINIUPNPC"]) + objects += upnp_env.SwiftenObject([ + "MiniUPnPInterface.cpp", + ]) objects += myenv.SwiftenObject([ "PlatformNATTraversalWorker.cpp", ]) |