generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove WebRTC dependency on libvpx_lib and libvpx_include.

Browse Source 
Removes dependencies on libvpx_lib and libvpx_include targets when
building with Chromium.

BUG=
TEST=

Review URL: http://webrtc-codereview.appspot.com/293004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1026 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
stefan@webrtc.org 2011-11-25 12:12:43 +00:00
parent 83661f534e
commit 0ee8ba1929
1 changed files with 12 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/modules/video_coding/codecs/vp8/main/source/vp8.gypi
View File

@ -16,49 +16,23 @@
], ],
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',
'../../../../../../common_video/interface', '<(webrtc_root)/common_video/interface',
'../../../../../../common_video/vplib/main/interface', '<(webrtc_root)/common_video/vplib/main/interface',
'../../../interface', '<(webrtc_root)/modules/video_coding/codecs/interface',
'../../../../../interface', '<(webrtc_root)/modules/interface',
], ],
'conditions': [ 'conditions': [
['build_with_chromium==1', { ['build_with_chromium==1', {
'conditions': [ 'dependencies': [
['target_arch=="arm"', { '<(webrtc_root)/../libvpx/libvpx.gyp:libvpx',
'dependencies': [ ],
'<(webrtc_root)/../libvpx/libvpx.gyp:libvpx_lib', 'defines': [
'<(webrtc_root)/../libvpx/libvpx.gyp:libvpx_include', 'WEBRTC_LIBVPX_VERSION=960' # Bali
], ],
}, { # arm
'conditions': [
['OS=="win"', {
'dependencies': [
# We don't want to link with the static library inside Chromium
# on Windows. Chromium uses the ffmpeg DLL and exports the
# necessary libvpx symbols for us.
'<(webrtc_root)/../libvpx/libvpx.gyp:libvpx_include',
],
},{ # non-arm, win
'dependencies': [
'<(webrtc_root)/../libvpx/libvpx.gyp:libvpx',
],
'include_dirs': [
'../../../../../../../libvpx/source/libvpx',
],
}], # non-arm, non-win
],
}],
],
'defines': [
'WEBRTC_LIBVPX_VERSION=960' # Bali
],
},{ },{
'dependencies': [ 'dependencies': [
'<(webrtc_root)/../third_party/libvpx/libvpx.gyp:libvpx', '<(webrtc_root)/../third_party/libvpx/libvpx.gyp:libvpx',
], ],
'include_dirs': [
'../../../../../../../third_party/libvpx/source/libvpx',
],
'defines': [ 'defines': [
'WEBRTC_LIBVPX_VERSION=971' # Cayuga 'WEBRTC_LIBVPX_VERSION=971' # Cayuga
], ],
@ -67,8 +41,8 @@
'direct_dependent_settings': { 'direct_dependent_settings': {
'include_dirs': [ 'include_dirs': [
'../interface', '../interface',
'../../../../../../common_video/interface', '<(webrtc_root)/common_video/interface',
'../../../interface', '<(webrtc_root)/modules/video_coding/codecs/interface',
], ],
}, },
'sources': [ 'sources': [