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

Side by Side Diff: webrtc/modules/video_capture/video_capture.gypi

Issue 2381853002: Revert of Unify the macOS and iOS capturer implementations (Closed)
Patch Set: Created 4 years, 2 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 | « webrtc/modules/video_capture/objc/video_capture.mm ('k') | 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) 2012 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 { 9 {
10 'targets': [ 10 'targets': [
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 ], 61 ],
62 }], 62 }],
63 ['OS=="linux"', { 63 ['OS=="linux"', {
64 'sources': [ 64 'sources': [
65 'linux/device_info_linux.cc', 65 'linux/device_info_linux.cc',
66 'linux/device_info_linux.h', 66 'linux/device_info_linux.h',
67 'linux/video_capture_linux.cc', 67 'linux/video_capture_linux.cc',
68 'linux/video_capture_linux.h', 68 'linux/video_capture_linux.h',
69 ], 69 ],
70 }], # linux 70 }], # linux
71 ['OS=="mac"', {
72 'sources': [
73 'mac/qtkit/video_capture_qtkit.h',
74 'mac/qtkit/video_capture_qtkit.mm',
75 'mac/qtkit/video_capture_qtkit_info.h',
76 'mac/qtkit/video_capture_qtkit_info.mm',
77 'mac/qtkit/video_capture_qtkit_info_objc.h',
78 'mac/qtkit/video_capture_qtkit_info_objc.mm',
79 'mac/qtkit/video_capture_qtkit_objc.h',
80 'mac/qtkit/video_capture_qtkit_objc.mm',
81 'mac/qtkit/video_capture_qtkit_utility.h',
82 'mac/video_capture_mac.mm',
83 ],
84 'link_settings': {
85 'xcode_settings': {
86 'OTHER_LDFLAGS': [
87 '-framework Cocoa',
88 '-framework CoreVideo',
89 '-framework QTKit',
90 ],
91 },
92 },
93 }], # mac
71 ['OS=="win"', { 94 ['OS=="win"', {
72 'dependencies': [ 95 'dependencies': [
73 '<(DEPTH)/third_party/winsdk_samples/winsdk_samples.gyp:directsh ow_baseclasses', 96 '<(DEPTH)/third_party/winsdk_samples/winsdk_samples.gyp:directsh ow_baseclasses',
74 ], 97 ],
75 'sources': [ 98 'sources': [
76 'windows/device_info_ds.cc', 99 'windows/device_info_ds.cc',
77 'windows/device_info_ds.h', 100 'windows/device_info_ds.h',
78 'windows/device_info_mf.cc', 101 'windows/device_info_mf.cc',
79 'windows/device_info_mf.h', 102 'windows/device_info_mf.h',
80 'windows/help_functions_ds.cc', 103 'windows/help_functions_ds.cc',
(...skipping 22 matching lines...) Expand all
103 '-Wno-ignored-attributes', 126 '-Wno-ignored-attributes',
104 '-Wno-microsoft-extra-qualification', 127 '-Wno-microsoft-extra-qualification',
105 '-Wno-missing-braces', 128 '-Wno-missing-braces',
106 '-Wno-overloaded-virtual', 129 '-Wno-overloaded-virtual',
107 '-Wno-reorder', 130 '-Wno-reorder',
108 '-Wno-writable-strings', 131 '-Wno-writable-strings',
109 ], 132 ],
110 }, 133 },
111 }, 134 },
112 }], 135 }],
113 ['OS=="ios" or OS=="mac"', { 136 ['OS=="ios"', {
114 'sources': [ 137 'sources': [
115 'apple/device_info.h', 138 'ios/device_info_ios.h',
116 'apple/device_info.mm', 139 'ios/device_info_ios.mm',
117 'apple/device_info_objc.h', 140 'ios/device_info_ios_objc.h',
118 'apple/device_info_objc.mm', 141 'ios/device_info_ios_objc.mm',
119 'apple/rtc_video_capture_objc.h', 142 'ios/rtc_video_capture_ios_objc.h',
120 'apple/rtc_video_capture_objc.mm', 143 'ios/rtc_video_capture_ios_objc.mm',
121 'apple/video_capture.h', 144 'ios/video_capture_ios.h',
122 'apple/video_capture.mm', 145 'ios/video_capture_ios.mm',
123 ], 146 ],
124 'xcode_settings': { 147 'xcode_settings': {
125 'CLANG_ENABLE_OBJC_ARC': 'YES', 148 'CLANG_ENABLE_OBJC_ARC': 'YES',
126 }, 149 },
127 'all_dependent_settings': { 150 'all_dependent_settings': {
128 'xcode_settings': { 151 'xcode_settings': {
129 'OTHER_LDFLAGS': [ 152 'OTHER_LDFLAGS': [
130 '-framework AVFoundation', 153 '-framework AVFoundation',
131 '-framework CoreMedia', 154 '-framework CoreMedia',
132 '-framework CoreVideo', 155 '-framework CoreVideo',
133 ],
134 },
135 },
136 }], # ios
137 ['OS=="ios"', {
138 'all_dependent_settings': {
139 'xcode_settings': {
140 'OTHER_LDFLAGS': [
141 '-framework UIKit', 156 '-framework UIKit',
142 ], 157 ],
143 }, 158 },
144 }, 159 },
145 }], # ios 160 }], # ios
146 ], # conditions 161 ], # conditions
147 }, 162 },
148 ], 163 ],
149 }], # build_with_chromium==0 164 }], # build_with_chromium==0
150 ['include_tests==1 and OS!="android"', { 165 ['include_tests==1 and OS!="android"', {
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 '<(webrtc_root)/test/test.gyp:test_support_main', 213 '<(webrtc_root)/test/test.gyp:test_support_main',
199 ], 214 ],
200 }], # OS!="mac" 215 }], # OS!="mac"
201 ] # conditions 216 ] # conditions
202 }, 217 },
203 ], # targets 218 ], # targets
204 }], 219 }],
205 ], 220 ],
206 } 221 }
207 222
OLDNEW
« no previous file with comments | « webrtc/modules/video_capture/objc/video_capture.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698