diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-30 04:27:26 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-30 04:27:26 +0000 |
| commit | 4ca3ebfee3d51f2921e170868c1fe3d8b6fe69b9 (patch) | |
| tree | 248699477d527e91bdfad69650ef0beb08310a62 /media/media.gyp | |
| parent | ee321411074be5c946ef15620d2872490f0e157f (diff) | |
| download | chromium_src-4ca3ebfee3d51f2921e170868c1fe3d8b6fe69b9.zip chromium_src-4ca3ebfee3d51f2921e170868c1fe3d8b6fe69b9.tar.gz chromium_src-4ca3ebfee3d51f2921e170868c1fe3d8b6fe69b9.tar.bz2 | |
Switching media to gyp under windows.
Review URL: http://codereview.chromium.org/57002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12761 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 68 |
1 files changed, 63 insertions, 5 deletions
diff --git a/media/media.gyp b/media/media.gyp index 6623568..2790f5b 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -28,17 +28,17 @@ ], 'msvs_guid': '6AE76406-B03B-11DD-94B1-80B556D89593', 'sources': [ + 'audio/audio_output.h', 'audio/linux/audio_manager_linux.cc', 'audio/mac/audio_manager_mac.cc', - 'audio/mac/audio_output_mac.h', - 'audio/mac/audio_output_mac.cc', + 'audio/mac/audio_output_mac.cc', + 'audio/mac/audio_output_mac.h', + 'audio/simple_sources.h', 'audio/win/audio_manager_win.h', 'audio/win/audio_output_win.cc', 'audio/win/simple_sources_win.cc', 'audio/win/waveout_output_win.cc', 'audio/win/waveout_output_win.h', - 'audio/audio_output.h', - 'audio/simple_sources.h', 'base/buffers.h', 'base/data_buffer.cc', 'base/data_buffer.h', @@ -66,18 +66,35 @@ 'filters/audio_renderer_impl.cc', 'filters/audio_renderer_impl.h', 'filters/decoder_base.h', + 'filters/ffmpeg_audio_decoder.cc', + 'filters/ffmpeg_audio_decoder.h', + 'filters/ffmpeg_common.cc', + 'filters/ffmpeg_common.h', + 'filters/ffmpeg_demuxer.cc', + 'filters/ffmpeg_demuxer.h', + 'filters/ffmpeg_glue.cc', + 'filters/ffmpeg_glue.h', + 'filters/ffmpeg_video_decoder.cc', + 'filters/ffmpeg_video_decoder.h', + 'filters/file_data_source.cc', 'filters/file_data_source.cc', 'filters/file_data_source.h', - 'filters/test_video_decoder.h', + 'filters/file_data_source.h', 'filters/null_audio_renderer.cc', 'filters/null_audio_renderer.h', + 'filters/test_video_decoder.h', + 'filters/test_video_renderer.h', 'filters/video_renderer_base.cc', 'filters/video_renderer_base.h', 'player/player.cc', ], + 'include_dirs': [ + '../third_party/ffmpeg/include', + ], 'direct_dependent_settings': { 'include_dirs': [ '..', + '../third_party/ffmpeg/include', ], }, 'conditions': [ @@ -88,12 +105,28 @@ '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework', ], }, + 'sources!': [ + 'filters/ffmpeg_audio_decoder.cc', + 'filters/ffmpeg_glue.cc', + 'filters/ffmpeg_video_decoder.cc', + ], + }], + ['OS =="win"', { + 'include_dirs': [ + '../third_party/ffmpeg/include/win', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../third_party/ffmpeg/include/win', + ], + }, }], ], }, { 'target_name': 'media_unittests', 'type': 'executable', + 'msvs_guid': 'C8C6183C-B03C-11DD-B471-DFD256D89593', 'dependencies': [ 'media', '../base/base.gyp:base', @@ -107,6 +140,8 @@ 'base/run_all_unittests.cc', 'base/video_frame_impl_unittest.cc', 'base/yuv_convert_unittest.cc', + 'filters/ffmpeg_demuxer_unittest.cc', + 'filters/ffmpeg_glue_unittest.cc', 'filters/file_data_source_unittest.cc', 'filters/video_decoder_unittest.cc', 'filters/video_renderer_unittest.cc', @@ -121,7 +156,30 @@ '../build/linux/system.gyp:gtk', ], }], + ['OS=="mac"', { + 'sources!': [ + 'filters/ffmpeg_demuxer_unittest.cc', + 'filters/ffmpeg_glue_unittest.cc', + ], + }], ], }, ], + 'conditions': [ + ['OS=="win"', { + 'targets': [ + { + 'target_name': 'media_player', + 'type': 'executable', + 'dependencies': [ + 'media', + '../base/base.gyp:base', + ], + 'sources': [ + 'player/player.cc', + ], + }, + ], + }], + ], } |