Swiftdiff options
| author | dknn <yoann.blein@free.fr> | 2012-07-09 11:57:44 (GMT) |
|---|---|---|
| committer | dknn <yoann.blein@free.fr> | 2012-09-22 09:00:01 (GMT) |
| commit | 68c8467913451099154b28d5a876ae14c1a9e1dd (patch) | |
| tree | 50fdc9ff78f95fc783c1ac80b0a510426202ae38 /Swiften/ScreenSharing/SConscript | |
| parent | 88822191fbc4deaad178a969e06f9527082e02d2 (diff) | |
| download | swift-contrib-68c8467913451099154b28d5a876ae14c1a9e1dd.zip swift-contrib-68c8467913451099154b28d5a876ae14c1a9e1dd.tar.bz2 | |
Fix linking errors + add libvpx
Diffstat (limited to 'Swiften/ScreenSharing/SConscript')
| -rw-r--r-- | Swiften/ScreenSharing/SConscript | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/Swiften/ScreenSharing/SConscript b/Swiften/ScreenSharing/SConscript index 6504541..a593296 100644 --- a/Swiften/ScreenSharing/SConscript +++ b/Swiften/ScreenSharing/SConscript @@ -2,14 +2,10 @@ Import("swiften_env", "env") sources = [ "Image.cpp", - "VP8Encoder.cpp", - "VP8RTPPacketizer.cpp", - "VP8Decoder.cpp", - "VP8RTPParser.cpp", "ScreenSharing.cpp", "OutgoingScreenSharing.cpp", - "OutgoingScreenSharingManager.cpp", "IncomingScreenSharing.cpp", + "OutgoingScreenSharingManager.cpp", "IncomingScreenSharingManager.cpp", "ScreenSharingManagerImpl.cpp", ] @@ -24,6 +20,17 @@ if swiften_env["experimental"] : "RTPSessionImpl.cpp", ]) + # libvpx classes + libvpx_env = swiften_env.Clone() + #libvpx_env.Append(CPPDEFINES = libvpx_env["LIBVPX_FLAGS"].get("INTERNAL_CPPDEFINES", [])) + libvpx_env.MergeFlags(libvpx_env.get("LIBVPX_FLAGS", {})) + objects += libvpx_env.SwiftenObject([ + "VP8Encoder.cpp", + "VP8Decoder.cpp", + "VP8RTPPacketizer.cpp", + "VP8RTPParser.cpp", + ]) + swiften_env.Append(SWIFTEN_OBJECTS = [objects]) #env.Append(UNITTEST_SOURCES = []) |