summaryrefslogtreecommitdiffstats
path: root/media/media.gyp
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-22 00:20:29 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-22 00:20:29 +0000
commitd06442883eb767e2b61de78f1d942fc0f9b87df1 (patch)
tree1a4d51ffb76cca03ceeb56c3f4b606bee6cfa176 /media/media.gyp
parent66cb83553557d41f5eb24a17c830f1e398fedb27 (diff)
downloadchromium_src-d06442883eb767e2b61de78f1d942fc0f9b87df1.zip
chromium_src-d06442883eb767e2b61de78f1d942fc0f9b87df1.tar.gz
chromium_src-d06442883eb767e2b61de78f1d942fc0f9b87df1.tar.bz2
Build on Linux with shared libraries (significant chunks courtesy craigsch):
* Set $RPATH to $LIB_DIR in the SCons configuration. * Add missing dependencies: * net/net.gyp:net => testing/gtest.gyp:gtest * third_party/libxml/libxml.gyp:xmlcatalog => third_party/icu38/icu38.gyp:icuuc * chrome/chrome.gyp:perf_tests => renderer => views => webkit/webkit.gyp:glue * Add files: * third_party/WebKit/WebCore/loader/icon/IconRecord.cpp * third_party/WebKit/WebCore/page/Coordinates.cpp * skia/sgl/SkUnPreMultiply.cpp * Exclude on Linux: * chrome/views/controls/scroll_view.cc * chrome/views/focus/external_focus_tracker.cc * media/filter/ffmpeg_demuxer.{cc,h} * Remove files: * third_party/WebKit/WebCore/Configurations/Version.xcconfig * Sort the chrome.gyp:views linux exclusion list. * DEPS roll for $SHLINKFLAGS settings in gyp. Review URL: http://codereview.chromium.org/88058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14166 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
-rw-r--r--media/media.gyp2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp
index 7f144d1..ee33bf0 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -103,6 +103,8 @@
['OS =="linux"', {
'sources!': [
'filters/ffmpeg_audio_decoder.cc',
+ 'filters/ffmpeg_demuxer.cc',
+ 'filters/ffmpeg_demuxer.h',
'filters/ffmpeg_glue.cc',
'filters/ffmpeg_video_decoder.cc',
],