diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-07 19:50:16 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-07 19:50:16 +0000 |
| commit | fdcb3545235dda8086a2655652775596a58e2116 (patch) | |
| tree | 50d79be901712ff0a94d31e902751a834169b54f /media/media.gyp | |
| parent | bbccf6941dff644a9d7bff2622a6f128478535ed (diff) | |
| download | chromium_src-fdcb3545235dda8086a2655652775596a58e2116.zip chromium_src-fdcb3545235dda8086a2655652775596a58e2116.tar.gz chromium_src-fdcb3545235dda8086a2655652775596a58e2116.tar.bz2 | |
Convert /third_party/ffmpeg to gyp for Windows builds.
To smooth out the transition I left in using_ffmpeg.vsprops until the rest of Windows switches over to gyp. I also took the opportunity to ditch the .bat file in favour of python.
Review URL: http://codereview.chromium.org/63054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13270 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/media/media.gyp b/media/media.gyp index 00a4675..b924a42 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -22,6 +22,7 @@ 'type': 'static_library', 'dependencies': [ '../base/base.gyp:base', + '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', ], 'include_dirs': [ '..', @@ -87,13 +88,9 @@ 'filters/video_renderer_base.cc', 'filters/video_renderer_base.h', ], - 'include_dirs': [ - '../third_party/ffmpeg/include', - ], 'direct_dependent_settings': { 'include_dirs': [ '..', - '../third_party/ffmpeg/include', ], }, 'conditions': [ @@ -117,16 +114,6 @@ 'filters/ffmpeg_video_decoder.cc', ], }], - ['OS =="win"', { - 'include_dirs': [ - '../third_party/ffmpeg/include/win', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../third_party/ffmpeg/include/win', - ], - }, - }], ], }, { @@ -184,6 +171,7 @@ 'dependencies': [ 'media', '../base/base.gyp:base', + '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', ], 'sources': [ 'player/player.cc', |