Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(627)

Side by Side Diff: third_party/ffmpeg/ffmpeg.gyp

Issue 342066: Fix conditional for ffmpegsumo build. (Closed)
Patch Set: Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 20 matching lines...) Expand all
31 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/ffmpeg', 31 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/ffmpeg',
32 'asm_library': 'ffmpegasm', 32 'asm_library': 'ffmpegasm',
33 }, 33 },
34 'conditions': [ 34 'conditions': [
35 # This condition is for migrating from pre-built binaries to an in-tree 35 # This condition is for migrating from pre-built binaries to an in-tree
36 # source build. Most of these should be removed once FFmpeg is built on 36 # source build. Most of these should be removed once FFmpeg is built on
37 # mac and linux. Windows will take more work. 37 # mac and linux. Windows will take more work.
38 # 38 #
39 # TODO(ajwong): Per the comment above, reduce this conditional's size and 39 # TODO(ajwong): Per the comment above, reduce this conditional's size and
40 # determine if in-tree build in Windows is tractable. 40 # determine if in-tree build in Windows is tractable.
41 ['OS!="linux" or OS!="freebsd" or use_system_ffmpeg==0', { 41 ['(OS!="linux" and OS!="freebsd") or use_system_ffmpeg!=0', {
42 'variables': { 42 'variables': {
43 'target_for_binaries': 'ffmpeg_binaries', 43 'target_for_binaries': 'ffmpeg_binaries',
44 'ffmpeg_include_root': 'include', 44 'ffmpeg_include_root': 'include',
45 }, 45 },
46 },{ # else OS=="linux" 46 },{ # else OS=="linux"
47 'variables': { 47 'variables': {
48 'target_for_binaries': 'ffmpegsumo_nolink', 48 'target_for_binaries': 'ffmpegsumo_nolink',
49 'ffmpeg_include_root': 'source/patched-ffmpeg-mt', 49 'ffmpeg_include_root': 'source/patched-ffmpeg-mt',
50 }, 50 },
51 'targets': [ 51 'targets': [
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 ], 589 ],
590 }, 590 },
591 ], 591 ],
592 } 592 }
593 593
594 # Local Variables: 594 # Local Variables:
595 # tab-width:2 595 # tab-width:2
596 # indent-tabs-mode:nil 596 # indent-tabs-mode:nil
597 # End: 597 # End:
598 # vim: set expandtab tabstop=2 shiftwidth=2: 598 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698