diff options
| author | crogers@google.com <crogers@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-29 21:21:34 +0000 |
|---|---|---|
| committer | crogers@google.com <crogers@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-29 21:21:34 +0000 |
| commit | 54afa74de949f9a379258341256036ccb6d92fb6 (patch) | |
| tree | b514fefe27a45a3db87078220b93d06d1cbb3061 /build | |
| parent | 6cc7dbae8b7131af3df5492a7ea8d69590b44f04 (diff) | |
| download | chromium_src-54afa74de949f9a379258341256036ccb6d92fb6.zip chromium_src-54afa74de949f9a379258341256036ccb6d92fb6.tar.gz chromium_src-54afa74de949f9a379258341256036ccb6d92fb6.tar.bz2 | |
Enable Windows and Linux for Web Audio API
BUG=none
TEST=none
(tested locally on Windows 7)
Review URL: http://codereview.chromium.org/6902160
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83595 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/features_override.gypi | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/build/features_override.gypi b/build/features_override.gypi index 6660caf..d1f547e 100644 --- a/build/features_override.gypi +++ b/build/features_override.gypi @@ -101,11 +101,20 @@ ], 'use_threaded_compositing': 1, }], - ['OS=="mac"', { + # TODO(crogers): For the moment Windows is only enabled for + # Google-branded build, since the FFmpeg DLLs need to be re-built + # for chromium. + ['OS=="mac" or OS=="linux" or (OS=="win" and branding=="Chrome")', { 'feature_defines': [ 'ENABLE_WEB_AUDIO=1', ], }], + # Mac OS X uses Accelerate.framework FFT by default instead of FFmpeg. + ['OS!="mac"', { + 'feature_defines': [ + 'WTF_USE_WEBAUDIO_FFMPEG=1', + ], + }], ], # TODO: If the need arises, create a mechanism that will intelligently # merge the lists rather than replace one with the other. This may |