summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-09-24 18:18:28 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-09-25 17:42:32 (GMT)
commit94f87ffc9769f2782b2267db813854b0fe752678 (patch)
tree56244712ade2be0d4a0a093d7721d18050e74f87 /3rdParty/LibMiniUPnPc
parent4f62e5ec4b42929fe3c1a68667e63cb1b7a35509 (diff)
downloadswift-contrib-94f87ffc9769f2782b2267db813854b0fe752678.zip
swift-contrib-94f87ffc9769f2782b2267db813854b0fe752678.tar.bz2
File transfer changes.
- Introduce 'experimental' flag to conditionally compile FT. - Use LibMiniUPNPC and NATPMP CPPDEFINES only locally in the classes that need them. - Extract abstract interface from NAT traversal classes - Avoid unit test warnings
Diffstat (limited to '3rdParty/LibMiniUPnPc')
-rw-r--r--3rdParty/LibMiniUPnPc/SConscript1
1 files changed, 1 insertions, 0 deletions
diff --git a/3rdParty/LibMiniUPnPc/SConscript b/3rdParty/LibMiniUPnPc/SConscript
index be9910c..c482109 100644
--- a/3rdParty/LibMiniUPnPc/SConscript
+++ b/3rdParty/LibMiniUPnPc/SConscript
@@ -11,6 +11,7 @@ if env.get("LIBMINIUPNPC_BUNDLED", False) :
"CPPPATH": [Dir("src/miniupnpc")],
"LIBPATH": [Dir(".")],
"LIBS": ["Swiften_MiniUPnPc"],
+ "INTERNAL_CPPDEFINES": ["STATICLIB"],
}
#if env["PLATFORM"] == "win32" :
# env["LIBIDN_FLAGS"]["CPPPATH"] += [Dir("stubs/win32")]