diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-18 22:10:27 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-18 22:10:27 +0000 |
| commit | e0d0014eb45448bf6bc59d905707d242f7517ba6 (patch) | |
| tree | 1030df65cda3e16b32a2aa1efcf688f95d89e3e6 /third_party/ffmpeg | |
| parent | d8aea60122ca0a50a63de1bc3ab9673086c0e59d (diff) | |
| download | chromium_src-e0d0014eb45448bf6bc59d905707d242f7517ba6.zip chromium_src-e0d0014eb45448bf6bc59d905707d242f7517ba6.tar.gz chromium_src-e0d0014eb45448bf6bc59d905707d242f7517ba6.tar.bz2 | |
Update ffmpeg binaries directories to support variants based off the target architecture.
BUG=20948
TEST=none
Review URL: http://codereview.chromium.org/215016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26630 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/ffmpeg')
| -rwxr-xr-x | third_party/ffmpeg/ffmpeg.gyp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index fb01b84..b02c593 100755 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -14,6 +14,7 @@ # Allow overridding the selection of which ffmpeg binaries to copy via an # environment variable. Affects the ffmpeg_binaries target. 'ffmpeg_branding%': '<(branding)', + 'ffmpeg_variant%': '<(target_arch)', 'use_system_ffmpeg%': 0, }, @@ -190,9 +191,9 @@ 'variables': { 'conditions': [ [ 'ffmpeg_branding=="Chrome"', { - 'branding_dir': 'chrome', - }, { # else ffmpeg_branding!="Chrome" - 'branding_dir': 'chromium', + 'ffmpeg_bin_dir': 'chrome/<(OS)/<(ffmpeg_variant)', + }, { # else ffmpeg_branding!="Chrome", assume chromium. + 'ffmpeg_bin_dir': 'chromium/<(OS)/<(ffmpeg_variant)', }], ], }, @@ -200,9 +201,9 @@ ['OS=="win"', { 'variables': { 'source_files': [ - 'binaries/<(branding_dir)/avcodec-52.dll', - 'binaries/<(branding_dir)/avformat-52.dll', - 'binaries/<(branding_dir)/avutil-50.dll', + 'binaries/<(ffmpeg_bin_dir)/avcodec-52.dll', + 'binaries/<(ffmpeg_bin_dir)/avformat-52.dll', + 'binaries/<(ffmpeg_bin_dir)/avutil-50.dll', ], }, 'dependencies': ['../../build/win/system.gyp:cygwin'], @@ -211,9 +212,9 @@ ['use_system_ffmpeg==0', { 'variables': { 'source_files': [ - 'binaries/<(branding_dir)/libavcodec.so.52', - 'binaries/<(branding_dir)/libavformat.so.52', - 'binaries/<(branding_dir)/libavutil.so.50', + 'binaries/<(ffmpeg_bin_dir)/libavcodec.so.52', + 'binaries/<(ffmpeg_bin_dir)/libavformat.so.52', + 'binaries/<(ffmpeg_bin_dir)/libavutil.so.50', ], }, }, { @@ -225,9 +226,9 @@ ], ['OS=="mac"', { 'variables': { 'source_files': [ - 'binaries/<(branding_dir)/libavcodec.52.dylib', - 'binaries/<(branding_dir)/libavformat.52.dylib', - 'binaries/<(branding_dir)/libavutil.50.dylib', + 'binaries/<(ffmpeg_bin_dir)/libavcodec.52.dylib', + 'binaries/<(ffmpeg_bin_dir)/libavformat.52.dylib', + 'binaries/<(ffmpeg_bin_dir)/libavutil.50.dylib', ], }, }], |