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

revert r430 to keep webrtc always ready to roll in chromium.

Browse Source 
r430 will be used when libvpx in chromium is rolled to Cayuga.
Review URL: http://webrtc-codereview.appspot.com/119008

git-svn-id: http://webrtc.googlecode.com/svn/trunk@431 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wjia@google.com 2011-08-23 23:41:00 +00:00
parent f9f1deba8f
commit 4482b04207
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/modules/video_coding/codecs/vp8/main/source/vp8.gyp
View File

@ -21,16 +21,29 @@
],
'conditions': [
['build_with_chromium==1', {
'include_dirs': [
'../../../../../../../libvpx/source/libvpx',
],
'conditions': [
['OS!="win"', {
# 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.
['target_arch=="arm"', {
'dependencies': [
'../../../../../../../libvpx/libvpx.gyp:libvpx',
'../../../../../../../libvpx/libvpx.gyp:libvpx_lib',
'../../../../../../../libvpx/libvpx.gyp:libvpx_include',
],
}, { # 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.
'../../../../../../../libvpx/libvpx.gyp:libvpx_include',
],
},{ # non-arm, win
'dependencies': [
'../../../../../../../libvpx/libvpx.gyp:libvpx',
],
'include_dirs': [
'../../../../../../../libvpx/source/libvpx',
],
}], # non-arm, non-win
],
}],
],