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

Side by Side Diff: source/ffmpeg.gyp

Issue 5193003: Fix build with system libvpx.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 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 | Annotate | Revision Log
« 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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 # There's a couple key GYP variables that control how FFmpeg is built: 5 # There's a couple key GYP variables that control how FFmpeg is built:
6 # ffmpeg_branding 6 # ffmpeg_branding
7 # Controls whether we build the Chromium or Google Chrome version of 7 # Controls whether we build the Chromium or Google Chrome version of
8 # FFmpeg. The Google Chrome version contains additional codecs. 8 # FFmpeg. The Google Chrome version contains additional codecs.
9 # Typical values are Chromium, Chrome, ChromiumOS, and ChromeOS. 9 # Typical values are Chromium, Chrome, ChromiumOS, and ChromeOS.
10 # use_system_ffmpeg 10 # use_system_ffmpeg
(...skipping 880 matching lines...) Expand 10 before | Expand all | Expand 10 after
891 'conditions': [ 891 'conditions': [
892 # Linux/Solaris need libdl for dlopen() and friends. 892 # Linux/Solaris need libdl for dlopen() and friends.
893 ['OS=="linux" or OS=="solaris"', { 893 ['OS=="linux" or OS=="solaris"', {
894 'link_settings': { 894 'link_settings': {
895 'libraries': [ 895 'libraries': [
896 '-ldl', 896 '-ldl',
897 ], 897 ],
898 }, 898 },
899 }], 899 }],
900 900
901 ['use_system_vpx!=0', {
902 'direct_dependent_settings': {
903 'link_settings': {
904 'libraries': [
905 '-lvpx',
scherkus (not reviewing) 2010/11/22 07:17:34 hmm so we already include -lpvx but that's when us
fbarchard1 2010/11/22 20:57:04 We need -lvpx if building ffmpeg.
906 ],
907 },
908 },
909 }],
910
901 # Add pkg-config result to include path when use_system_ffmpeg!=0 911 # Add pkg-config result to include path when use_system_ffmpeg!=0
902 ['use_system_ffmpeg!=0', { 912 ['use_system_ffmpeg!=0', {
903 'cflags': [ 913 'cflags': [
904 '<!@(pkg-config --cflags libavcodec libavformat libavutil)', 914 '<!@(pkg-config --cflags libavcodec libavformat libavutil)',
905 ], 915 ],
906 'direct_dependent_settings': { 916 'direct_dependent_settings': {
907 'cflags': [ 917 'cflags': [
908 '<!@(pkg-config --cflags libavcodec libavformat libavutil)', 918 '<!@(pkg-config --cflags libavcodec libavformat libavutil)',
909 ], 919 ],
910 }, 920 },
(...skipping 21 matching lines...) Expand all
932 ], # conditions 942 ], # conditions
933 }, 943 },
934 ], # targets 944 ], # targets
935 } 945 }
936 946
937 # Local Variables: 947 # Local Variables:
938 # tab-width:2 948 # tab-width:2
939 # indent-tabs-mode:nil 949 # indent-tabs-mode:nil
940 # End: 950 # End:
941 # vim: set expandtab tabstop=2 shiftwidth=2: 951 # 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