diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-05 00:56:41 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-05 00:56:41 +0000 |
| commit | 995925ba4447efcc0d1d81285504621d87e50662 (patch) | |
| tree | 9103a423e26ee97b8c7e2cd268a60b73c1721ccd /build | |
| parent | 92f181bdad8897a5891d6a67a7aa5de7caa8402c (diff) | |
| download | chromium_src-995925ba4447efcc0d1d81285504621d87e50662.zip chromium_src-995925ba4447efcc0d1d81285504621d87e50662.tar.gz chromium_src-995925ba4447efcc0d1d81285504621d87e50662.tar.bz2 | |
FFmpeg in-tree build for mac.
BUG=26509
TEST=none
Review URL: http://codereview.chromium.org/340072
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31050 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp index 6092725..58c4119 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -54,6 +54,11 @@ '../webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp:*', ], }], + ['OS=="mac" or OS=="linux" or OS=="freebsd"', { + 'dependencies': [ + '../third_party/yasm/yasm.gyp:*', + ], + }], ['OS=="mac"', { 'dependencies': [ '../third_party/ocmock/ocmock.gyp:*', @@ -64,7 +69,6 @@ '../breakpad/breakpad.gyp:*', '../courgette/courgette.gyp:*', '../sandbox/sandbox.gyp:*', - '../third_party/yasm/yasm.gyp:*', '../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*', '../tools/xdisplaycheck/xdisplaycheck.gyp:*', ], |