| OLD | NEW |
| 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'target_defaults': { | 6 'target_defaults': { |
| 7 'conditions': [ | 7 'conditions': [ |
| 8 ['OS!="linux" and OS!="freebsd"', {'sources/': [['exclude', '/linux/']]}], | 8 ['OS!="linux" and OS!="freebsd"', {'sources/': [['exclude', '/linux/']]}], |
| 9 ['OS!="mac"', {'sources/': [['exclude', '/mac/']]}], | 9 ['OS!="mac"', {'sources/': [['exclude', '/mac/']]}], |
| 10 ['OS!="win"', {'sources/': [['exclude', '/win/']]}], | 10 ['OS!="win"', {'sources/': [['exclude', '/win/']]}], |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 # | 36 # |
| 37 # TODO(ajwong): Per the comment above, reduce this conditional's size and | 37 # TODO(ajwong): Per the comment above, reduce this conditional's size and |
| 38 # determine if in-tree build in Windows is tractable. | 38 # determine if in-tree build in Windows is tractable. |
| 39 ['OS!="linux" and OS!="freebsd"', { | 39 ['OS!="linux" and OS!="freebsd"', { |
| 40 'variables': { | 40 'variables': { |
| 41 'target_for_binaries': 'ffmpeg_binaries', | 41 'target_for_binaries': 'ffmpeg_binaries', |
| 42 'ffmpeg_include_root': 'include', | 42 'ffmpeg_include_root': 'include', |
| 43 }, | 43 }, |
| 44 },{ # else OS=="linux" | 44 },{ # else OS=="linux" |
| 45 'variables': { | 45 'variables': { |
| 46 'target_for_binaries': 'ffmpegsumo_nolink', | 46 'target_for_binaries': 'ffmpeg_binaries', |
| 47 'ffmpeg_include_root': 'source/patched-ffmpeg-mt', | 47 'ffmpeg_include_root': 'source/patched-ffmpeg-mt', |
| 48 }, | 48 }, |
| 49 'targets': [ | 49 'targets': [ |
| 50 { | 50 { |
| 51 'target_name': 'ffmpegsumo', | 51 'target_name': 'ffmpegsumo', |
| 52 'type': 'shared_library', | 52 'type': 'shared_library', |
| 53 'dependencies': [ | 53 'dependencies': [ |
| 54 'make_ffmpeg_asm_lib', | 54 'make_ffmpeg_asm_lib', |
| 55 ], | 55 ], |
| 56 'sources': [ | 56 'sources': [ |
| (...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 553 'binaries/<(ffmpeg_bin_dir)/avcodec-52.dll', | 553 'binaries/<(ffmpeg_bin_dir)/avcodec-52.dll', |
| 554 'binaries/<(ffmpeg_bin_dir)/avformat-52.dll', | 554 'binaries/<(ffmpeg_bin_dir)/avformat-52.dll', |
| 555 'binaries/<(ffmpeg_bin_dir)/avutil-50.dll', | 555 'binaries/<(ffmpeg_bin_dir)/avutil-50.dll', |
| 556 ], | 556 ], |
| 557 }, | 557 }, |
| 558 'dependencies': ['../../build/win/system.gyp:cygwin'], | 558 'dependencies': ['../../build/win/system.gyp:cygwin'], |
| 559 }], ['OS=="linux" or OS=="freebsd"', { | 559 }], ['OS=="linux" or OS=="freebsd"', { |
| 560 'variables': { | 560 'variables': { |
| 561 # TODO(ajwong): Clean this up after we've finished | 561 # TODO(ajwong): Clean this up after we've finished |
| 562 # migrating to in-tree build. | 562 # migrating to in-tree build. |
| 563 'source_files': [], | 563 'source_files': [ |
| 564 # TODO(ajwong): Temporary revert to make tree green while |
| 565 # builder libraries are updated. |
| 566 'binaries/<(ffmpeg_bin_dir)/libavcodec.so.52', |
| 567 'binaries/<(ffmpeg_bin_dir)/libavformat.so.52', |
| 568 'binaries/<(ffmpeg_bin_dir)/libavutil.so.50', |
| 569 ], |
| 564 }, | 570 }, |
| 565 }], ['OS=="mac"', { | 571 }], ['OS=="mac"', { |
| 566 # TODO(ajwong): These files are also copied in: | 572 # TODO(ajwong): These files are also copied in: |
| 567 # webkit/tools/test_shell/test_shell.gyp and | 573 # webkit/tools/test_shell/test_shell.gyp and |
| 568 # chrome/chrome.gyp | 574 # chrome/chrome.gyp |
| 569 # Need to consolidate the copies in one place. (BUG=23602) | 575 # Need to consolidate the copies in one place. (BUG=23602) |
| 570 'variables': { | 576 'variables': { |
| 571 'source_files': [ | 577 'source_files': [ |
| 572 'binaries/<(ffmpeg_bin_dir)/libavcodec.52.dylib', | 578 'binaries/<(ffmpeg_bin_dir)/libavcodec.52.dylib', |
| 573 'binaries/<(ffmpeg_bin_dir)/libavformat.52.dylib', | 579 'binaries/<(ffmpeg_bin_dir)/libavformat.52.dylib', |
| (...skipping 12 matching lines...) Expand all Loading... |
| 586 ], | 592 ], |
| 587 }, | 593 }, |
| 588 ], | 594 ], |
| 589 } | 595 } |
| 590 | 596 |
| 591 # Local Variables: | 597 # Local Variables: |
| 592 # tab-width:2 | 598 # tab-width:2 |
| 593 # indent-tabs-mode:nil | 599 # indent-tabs-mode:nil |
| 594 # End: | 600 # End: |
| 595 # vim: set expandtab tabstop=2 shiftwidth=2: | 601 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |