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

Side by Side Diff: media/media.gyp

Issue 100195: Enable video in linux build and remove unneeded ifdefs to guard windows. (Closed)
Patch Set: Fix inifite loop. Created 11 years, 7 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 | « media/filters/ffmpeg_glue.cc ('k') | webkit/webkit.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 'filters/video_renderer_base.cc', 94 'filters/video_renderer_base.cc',
95 'filters/video_renderer_base.h', 95 'filters/video_renderer_base.h',
96 ], 96 ],
97 'direct_dependent_settings': { 97 'direct_dependent_settings': {
98 'include_dirs': [ 98 'include_dirs': [
99 '..', 99 '..',
100 ], 100 ],
101 }, 101 },
102 'conditions': [ 102 'conditions': [
103 ['OS =="linux"', { 103 ['OS =="linux"', {
104 'sources!': [ 104 'sources/': [ ['exclude', '_(mac|win)\\.cc$'] ],
105 'filters/ffmpeg_audio_decoder.cc',
106 'filters/ffmpeg_demuxer.cc',
107 'filters/ffmpeg_demuxer.h',
108 'filters/ffmpeg_glue.cc',
109 'filters/ffmpeg_video_decoder.cc',
110 ],
111 'sources/': [ ['exclude', '_(mac|win)\\.cc$'],
112 ['exclude', '\\.mm?$' ] ],
113 }], 105 }],
114 ['OS =="mac"', { 106 ['OS =="mac"', {
115 'link_settings': { 107 'link_settings': {
116 'libraries': [ 108 'libraries': [
117 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework', 109 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
118 '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework', 110 '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework',
119 ], 111 ],
120 }, 112 },
121 'sources!': [ 113 'sources!': [
122 'filters/ffmpeg_audio_decoder.cc', 114 'filters/ffmpeg_audio_decoder.cc',
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 'player/player_wtl.rc', 208 'player/player_wtl.rc',
217 'player/resource.h', 209 'player/resource.h',
218 'player/stdafx.h', 210 'player/stdafx.h',
219 'player/stdafx.cc', 211 'player/stdafx.cc',
220 ], 212 ],
221 }, 213 },
222 ], 214 ],
223 }], 215 }],
224 ], 216 ],
225 } 217 }
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_glue.cc ('k') | webkit/webkit.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698