summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-09-16 08:46:53 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-09-16 08:46:53 (GMT)
commit72634a2e207528a705f1e09dbc8b87e76b6eb580 (patch)
treea7f5737e2cff0ef4a2ec79290a46bbebe860081c /3rdParty/LibNATPMP
parent12f6f31bbe60de989bad2b622f9f15285e44513a (diff)
downloadswift-72634a2e207528a705f1e09dbc8b87e76b6eb580.zip
swift-72634a2e207528a705f1e09dbc8b87e76b6eb580.tar.bz2
Bundle other 3rdParty libs with libSwiften.
Diffstat (limited to '3rdParty/LibNATPMP')
-rw-r--r--3rdParty/LibNATPMP/SConscript3
1 files changed, 1 insertions, 2 deletions
diff --git a/3rdParty/LibNATPMP/SConscript b/3rdParty/LibNATPMP/SConscript
index 2cf745a..98767fb 100644
--- a/3rdParty/LibNATPMP/SConscript
+++ b/3rdParty/LibNATPMP/SConscript
@@ -10,7 +10,6 @@ if env.get("LIBNATPMP_BUNDLED", False) :
env["LIBNATPMP_FLAGS"] = {
"CPPPATH": [Dir("src/libnatpmp")],
"LIBPATH": [Dir(".")],
- "LIBS": ["Swiften_NATPMP"],
"INTERNAL_CPPDEFINES": ["STATICLIB"],
}
#if env["PLATFORM"] == "win32" :
@@ -48,4 +47,4 @@ if env.get("LIBNATPMP_BUNDLED", False) :
if myenv["PLATFORM"] == "win32":
src_files += ["src/libnatpmp/wingettimeofday.c"]
- myenv.StaticLibrary("Swiften_NATPMP", src_files)
+ env["LIBNATPMP_OBJECTS"] = myenv.StaticObject(src_files)