summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordknn <yoann.blein@free.fr>2012-07-09 13:42:11 (GMT)
committerdknn <yoann.blein@free.fr>2012-09-22 09:01:24 (GMT)
commit79ee86a4deeb29c1be6d6838e54aae32d4c3e1ec (patch)
treef40c79c2babbcc98b78ebea7326705cc2995c93f
parent68c8467913451099154b28d5a876ae14c1a9e1dd (diff)
downloadswift-contrib-79ee86a4deeb29c1be6d6838e54aae32d4c3e1ec.zip
swift-contrib-79ee86a4deeb29c1be6d6838e54aae32d4c3e1ec.tar.bz2
Fix dependency issue with libvpx
-rw-r--r--Swiften/SConscript2
-rw-r--r--Swiften/ScreenSharing/SConscript2
2 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/SConscript b/Swiften/SConscript
index 78c20e5..b8ca1d9 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -6,7 +6,7 @@ Import("env")
# Flags
################################################################################
-swiften_dep_modules = ["BOOST", "GCONF", "ICU", "LIBIDN", "ZLIB", "OPENSSL", "LIBXML", "EXPAT", "AVAHI", "LIBMINIUPNPC", "LIBNATPMP", "SQLITE", "SQLITE_ASYNC", "JRTPLIB"]
+swiften_dep_modules = ["BOOST", "GCONF", "ICU", "LIBIDN", "ZLIB", "OPENSSL", "LIBXML", "EXPAT", "AVAHI", "LIBMINIUPNPC", "LIBNATPMP", "SQLITE", "SQLITE_ASYNC", "JRTPLIB", "LIBVPX"]
external_swiften_dep_modules = ["BOOST"]
if env["SCONS_STAGE"] == "flags" :
diff --git a/Swiften/ScreenSharing/SConscript b/Swiften/ScreenSharing/SConscript
index a593296..1eeb443 100644
--- a/Swiften/ScreenSharing/SConscript
+++ b/Swiften/ScreenSharing/SConscript
@@ -8,6 +8,7 @@ sources = [
"OutgoingScreenSharingManager.cpp",
"IncomingScreenSharingManager.cpp",
"ScreenSharingManagerImpl.cpp",
+ "VP8RTPParser.cpp",
]
objects = swiften_env.SwiftenObject(sources)
@@ -28,7 +29,6 @@ if swiften_env["experimental"] :
"VP8Encoder.cpp",
"VP8Decoder.cpp",
"VP8RTPPacketizer.cpp",
- "VP8RTPParser.cpp",
])
swiften_env.Append(SWIFTEN_OBJECTS = [objects])