build/all.gyp - Issue 340072: FFmpeg in-tree build for mac.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/all.gyp

Issue 340072: FFmpeg in-tree build for mac. (Closed)

Patch Set: work around link-settings bug. Created 11 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: build/all.gyp

diff --git a/build/all.gyp b/build/all.gyp

index 94cca3d066f3ac190d66742850bc648561ec3e56..0d65a6e6e80a9c81a6bbac5f3cad56a3f457d332 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:*',

@@ -65,7 +70,6 @@

'../courgette/courgette.gyp:*',

'../sandbox/sandbox.gyp:*',

'../third_party/harfbuzz/harfbuzz.gyp:*',

- '../third_party/yasm/yasm.gyp:*',

'../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*',

'../tools/xdisplaycheck/xdisplaycheck.gyp:*',

« no previous file with comments | « DEPS ('k') | chrome/chrome.gyp » ('j') | no next file with comments »