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

Side by Side Diff: media/media.gyp

Issue 67212: Fixes to make shared build work for app (chrome) target on linux. (Closed)
Patch Set: merge with HEAD Created 11 years, 8 months 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 | « chrome/chrome.gyp ('k') | net/net.gyp » ('j') | 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/common.gypi', 10 '../build/common.gypi',
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 ], 94 ],
95 'direct_dependent_settings': { 95 'direct_dependent_settings': {
96 'include_dirs': [ 96 'include_dirs': [
97 '..', 97 '..',
98 ], 98 ],
99 }, 99 },
100 'conditions': [ 100 'conditions': [
101 ['OS =="linux"', { 101 ['OS =="linux"', {
102 'sources!': [ 102 'sources!': [
103 'filters/ffmpeg_audio_decoder.cc', 103 'filters/ffmpeg_audio_decoder.cc',
104 'filters/ffmpeg_demuxer.cc',
105 'filters/ffmpeg_demuxer.h',
104 'filters/ffmpeg_glue.cc', 106 'filters/ffmpeg_glue.cc',
105 'filters/ffmpeg_video_decoder.cc', 107 'filters/ffmpeg_video_decoder.cc',
106 ], 108 ],
107 'sources/': [ ['exclude', '_(mac|win)\\.cc$'], 109 'sources/': [ ['exclude', '_(mac|win)\\.cc$'],
108 ['exclude', '\\.mm?$' ] ], 110 ['exclude', '\\.mm?$' ] ],
109 }], 111 }],
110 ['OS =="mac"', { 112 ['OS =="mac"', {
111 'link_settings': { 113 'link_settings': {
112 'libraries': [ 114 'libraries': [
113 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework', 115 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 201 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
200 ], 202 ],
201 'sources': [ 203 'sources': [
202 'bench/bench.cc', 204 'bench/bench.cc',
203 ], 205 ],
204 }, 206 },
205 ], 207 ],
206 }], 208 }],
207 ], 209 ],
208 } 210 }
OLDNEW
« no previous file with comments | « chrome/chrome.gyp ('k') | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698