From c040079a2b8ea8c898fe433c3e61ff3ae927698f Mon Sep 17 00:00:00 2001 From: "ajwong@chromium.org" Date: Fri, 30 Oct 2009 12:39:15 +0000 Subject: Disable the whole ffmpegsumo clause via a tautology. TBR=mark git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30573 0039d316-1c4b-4281-b951-d872f2087c98 --- third_party/ffmpeg/ffmpeg.gyp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'third_party') diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index 64cf546..1b7d421 100755 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -36,14 +36,14 @@ # # TODO(ajwong): Per the comment above, reduce this conditional's size and # determine if in-tree build in Windows is tractable. - ['OS!="linux" and OS!="freebsd"', { + ['OS!="linux" or OS=="freebsd" or OS=="linux"', { 'variables': { 'target_for_binaries': 'ffmpeg_binaries', 'ffmpeg_include_root': 'include', }, },{ # else OS=="linux" 'variables': { - 'target_for_binaries': 'ffmpeg_binaries', + 'target_for_binaries': 'ffmpegsumo_nolink', 'ffmpeg_include_root': 'source/patched-ffmpeg-mt', }, 'targets': [ -- cgit v1.1