summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-30 19:56:22 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-30 19:56:22 +0000
commit744c69e22d6d8da9203a0d13c1b33f91ac2a09f9 (patch)
tree7c32e4a68f198b6b25c2b25929b2f34e8b831213 /media
parent44d568ec954287a29ff14ae3f2217b7ec534e49f (diff)
downloadchromium_src-744c69e22d6d8da9203a0d13c1b33f91ac2a09f9.zip
chromium_src-744c69e22d6d8da9203a0d13c1b33f91ac2a09f9.tar.gz
chromium_src-744c69e22d6d8da9203a0d13c1b33f91ac2a09f9.tar.bz2
Exclude ffmpeg_* files that don't build on Linux, too.
Review URL: http://codereview.chromium.org/57020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12797 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/media.gyp11
1 files changed, 11 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp
index 2790f5b..47cfe1a 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -98,6 +98,13 @@
],
},
'conditions': [
+ ['OS =="linux"', {
+ 'sources!': [
+ 'filters/ffmpeg_audio_decoder.cc',
+ 'filters/ffmpeg_glue.cc',
+ 'filters/ffmpeg_video_decoder.cc',
+ ],
+ }],
['OS =="mac"', {
'link_settings': {
'libraries': [
@@ -155,6 +162,10 @@
# gtk/gtk.h
'../build/linux/system.gyp:gtk',
],
+ 'sources!': [
+ 'filters/ffmpeg_demuxer_unittest.cc',
+ 'filters/ffmpeg_glue_unittest.cc',
+ ],
}],
['OS=="mac"', {
'sources!': [