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

Get ready for libvpx Cayuga (v0.9.7-p1).

Browse Source 
When building with Chromium, on Windows, only header files are needed; otherwise, libvpx.gyp:libvpx is needed.

This patch is based on http://webrtc-codereview.appspot.com/91019/
Review URL: http://webrtc-codereview.appspot.com/122005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@430 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wjia@google.com 2011-08-23 23:08:30 +00:00
parent dec6aa57f3
commit f9f1deba8f
1 changed files with 8 additions and 21 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,29 +21,16 @@
],
'conditions': [
['build_with_chromium==1', {
'include_dirs': [
'../../../../../../../libvpx/source/libvpx',
],
'conditions': [
['target_arch=="arm"', {
['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.
'dependencies': [
'../../../../../../../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
'../../../../../../../libvpx/libvpx.gyp:libvpx',
],
}],
],