diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-21 22:49:44 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-21 22:49:44 +0000 |
| commit | a6fb2d6387b558db727f7c3d421cde0e1e092aa7 (patch) | |
| tree | d82af5b1f6c8429eb0e748c6c906b373002cfda4 /media/media.gyp | |
| parent | 6892d42b987764bc802c3782ad47e877e8e56da7 (diff) | |
| download | chromium_src-a6fb2d6387b558db727f7c3d421cde0e1e092aa7.zip chromium_src-a6fb2d6387b558db727f7c3d421cde0e1e092aa7.tar.gz chromium_src-a6fb2d6387b558db727f7c3d421cde0e1e092aa7.tar.bz2 | |
Hacked up delay load code for ffmpeg in posix systems. This is
a temporary solution. We need to find a more sustainable way to
do this.
Review URL: http://codereview.chromium.org/87018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14150 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 53 |
1 files changed, 24 insertions, 29 deletions
diff --git a/media/media.gyp b/media/media.gyp index d5c2323..7f144d1 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -176,35 +176,30 @@ }], ], }, - ], - 'conditions': [ - ['OS=="win"', { - 'targets': [ - { - 'target_name': 'media_player', - 'type': 'executable', - 'dependencies': [ - 'media', - '../base/base.gyp:base', - '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', - ], - 'sources': [ - ], - }, - { - 'target_name': 'media_bench', - 'type': 'executable', - 'msvs_guid': '45BC4F87-4604-4962-A751-7C7B29A080BF', - 'dependencies': [ - 'media', - '../base/base.gyp:base', - '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', - ], - 'sources': [ - 'bench/bench.cc', - ], - }, + { + 'target_name': 'media_player', + 'type': 'executable', + 'dependencies': [ + 'media', + '../base/base.gyp:base', + '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', ], - }], + 'sources': [ + 'player/player.cc', + ], + }, + { + 'target_name': 'media_bench', + 'type': 'executable', + 'msvs_guid': '45BC4F87-4604-4962-A751-7C7B29A080BF', + 'dependencies': [ + 'media', + '../base/base.gyp:base', + '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', + ], + 'sources': [ + 'bench/bench.cc', + ], + }, ], } |