| Index: media/media.gyp
|
| diff --git a/media/media.gyp b/media/media.gyp
|
| index 8453038613e6b5e12844db1ed1c11e8a2e297acb..054578813db0e24cf09d3ceef11df6e1057cb77e 100644
|
| --- a/media/media.gyp
|
| +++ b/media/media.gyp
|
| @@ -57,9 +57,6 @@
|
| 'base/media.h',
|
| 'base/media_format.cc',
|
| 'base/media_format.h',
|
| - 'base/mock_filter_host.h',
|
| - 'base/mock_media_filters.h',
|
| - 'base/mock_pipeline.h',
|
| 'base/pipeline.h',
|
| 'base/pipeline_impl.cc',
|
| 'base/pipeline_impl.h',
|
| @@ -150,6 +147,11 @@
|
| 'audio/mac/audio_output_mac_unittest.cc',
|
| 'audio/simple_sources_unittest.cc',
|
| 'base/data_buffer_unittest.cc',
|
| + 'base/mock_ffmpeg.cc',
|
| + 'base/mock_ffmpeg.h',
|
| + 'base/mock_filter_host.h',
|
| + 'base/mock_media_filters.h',
|
| + 'base/mock_pipeline.h',
|
| 'base/pipeline_impl_unittest.cc',
|
| 'base/run_all_unittests.cc',
|
| 'base/seekable_buffer_unittest.cc',
|
| @@ -172,6 +174,7 @@
|
| '../build/linux/system.gyp:gtk',
|
| ],
|
| 'sources!': [
|
| + 'base/mock_ffmpeg.cc',
|
| 'filters/ffmpeg_demuxer_unittest.cc',
|
| 'filters/ffmpeg_glue_unittest.cc',
|
| 'filters/ffmpeg_video_decoder_unittest.cc',
|
| @@ -179,6 +182,7 @@
|
| }],
|
| ['OS=="mac"', {
|
| 'sources!': [
|
| + 'base/mock_ffmpeg.cc',
|
| 'filters/ffmpeg_demuxer_unittest.cc',
|
| 'filters/ffmpeg_glue_unittest.cc',
|
| 'filters/ffmpeg_video_decoder_unittest.cc',
|
| @@ -220,20 +224,20 @@
|
| '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
|
| ],
|
| 'sources': [
|
| - 'player/list.h',
|
| - 'player/mainfrm.h',
|
| - 'player/movie.cc',
|
| - 'player/movie.h',
|
| - 'player/player_wtl.cc',
|
| - 'player/player_wtl.rc',
|
| - 'player/props.h',
|
| - 'player/seek.h',
|
| - 'player/resource.h',
|
| - 'player/stdafx.h',
|
| - 'player/view.h',
|
| - 'player/wtl_renderer.cc',
|
| - 'player/wtl_renderer.h',
|
| - ],
|
| + 'player/list.h',
|
| + 'player/mainfrm.h',
|
| + 'player/movie.cc',
|
| + 'player/movie.h',
|
| + 'player/player_wtl.cc',
|
| + 'player/player_wtl.rc',
|
| + 'player/props.h',
|
| + 'player/seek.h',
|
| + 'player/resource.h',
|
| + 'player/stdafx.h',
|
| + 'player/view.h',
|
| + 'player/wtl_renderer.cc',
|
| + 'player/wtl_renderer.h',
|
| + ],
|
| 'msvs_settings': {
|
| 'VCLinkerTool': {
|
| 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
|
|
|