diff options
author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-23 22:56:14 +0000 |
---|---|---|
committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-23 22:56:14 +0000 |
commit | 1ed60a369d47c7fce9a92d52513486960f63506d (patch) | |
tree | 9ef3af4c715d89fc5a399fff6113b44a69a62180 /media/media.gyp | |
parent | 1e0a02d6464d8d1d5934c2a9bae6e852537c76b2 (diff) | |
download | chromium_src-1ed60a369d47c7fce9a92d52513486960f63506d.zip chromium_src-1ed60a369d47c7fce9a92d52513486960f63506d.tar.gz chromium_src-1ed60a369d47c7fce9a92d52513486960f63506d.tar.bz2 |
Resource file for media player.
Review URL: http://codereview.chromium.org/93082
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14365 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
-rw-r--r-- | media/media.gyp | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/media/media.gyp b/media/media.gyp index ee33bf0..3b1bb3f 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -179,18 +179,6 @@ ], }, { - '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', @@ -204,4 +192,30 @@ ], }, ], + 'conditions': [ + ['OS=="win"', { + 'targets': [ + { + 'target_name': 'media_player', + 'type': 'executable', + 'dependencies': [ + 'media', + '../base/base.gyp:base', + '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', + ], + 'include_dirs': [ + '../chrome/third_party/wtl/include', + ], + 'dependencies': [ + 'media', + '../base/base.gyp:base', + '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', + ], + 'sources': [ + 'player/player_wtl.rc', + ], + }, + ], + }], + ], } |