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

Side by Side Diff: webrtc/webrtc_examples.gyp

Issue 1493003002: Fix Mac ObjC PeerConnection API compilation. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years 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 | « talk/libjingle_tests.gyp ('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 'includes': [ 9 'includes': [
10 '../talk/build/common.gypi', 10 '../talk/build/common.gypi',
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 '-lXext', 125 '-lXext',
126 '-lXrender', 126 '-lXrender',
127 ], 127 ],
128 }, 128 },
129 }], # OS=="linux" 129 }], # OS=="linux"
130 ], # conditions 130 ], # conditions
131 }, # target peerconnection_client 131 }, # target peerconnection_client
132 ], # targets 132 ], # targets
133 }], # OS=="linux" or OS=="win" 133 }], # OS=="linux" or OS=="win"
134 134
135 ['OS=="ios" or (OS=="mac" and target_arch!="ia32" and mac_sdk>="10.8")', { 135 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
136 'targets': [ 136 'targets': [
137 { 137 {
138 'target_name': 'apprtc_common', 138 'target_name': 'apprtc_common',
139 'type': 'static_library', 139 'type': 'static_library',
140 'dependencies': [ 140 'dependencies': [
141 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_defa ult', 141 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_defa ult',
142 '../talk/libjingle.gyp:libjingle_peerconnection_objc', 142 '../talk/libjingle.gyp:libjingle_peerconnection_objc',
143 ], 143 ],
144 'sources': [ 144 'sources': [
145 'examples/objc/AppRTCDemo/common/ARDUtilities.h', 145 'examples/objc/AppRTCDemo/common/ARDUtilities.h',
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 ], 325 ],
326 'direct_dependent_settings': { 326 'direct_dependent_settings': {
327 'include_dirs': [ 327 'include_dirs': [
328 'examples/objc/AppRTCDemo/third_party/SocketRocket', 328 'examples/objc/AppRTCDemo/third_party/SocketRocket',
329 ], 329 ],
330 }, 330 },
331 'xcode_settings': { 331 'xcode_settings': {
332 'CLANG_ENABLE_OBJC_ARC': 'YES', 332 'CLANG_ENABLE_OBJC_ARC': 'YES',
333 'WARNING_CFLAGS': [ 333 'WARNING_CFLAGS': [
334 '-Wno-deprecated-declarations', 334 '-Wno-deprecated-declarations',
335 '-Wno-nonnull',
335 ], 336 ],
336 }, 337 },
337 'link_settings': { 338 'link_settings': {
338 'xcode_settings': { 339 'xcode_settings': {
339 'OTHER_LDFLAGS': [ 340 'OTHER_LDFLAGS': [
340 '-framework CFNetwork', 341 '-framework CFNetwork',
341 '-licucore', 342 '-licucore',
342 ], 343 ],
343 }, 344 },
344 } 345 }
345 }, # target socketrocket 346 }, # target socketrocket
346 ], # targets 347 ], # targets
347 }], # OS=="ios" or (OS=="mac" and target_arch!="ia32" and mac_sdk>="10.8") 348 }], # OS=="ios" or (OS=="mac" and target_arch!="ia32")
348 349
349 ['OS=="android"', { 350 ['OS=="android"', {
350 'targets': [ 351 'targets': [
351 { 352 {
352 'target_name': 'AppRTCDemo', 353 'target_name': 'AppRTCDemo',
353 'type': 'none', 354 'type': 'none',
354 'dependencies': [ 355 'dependencies': [
355 '../talk/libjingle.gyp:libjingle_peerconnection_java', 356 '../talk/libjingle.gyp:libjingle_peerconnection_java',
356 ], 357 ],
357 'variables': { 358 'variables': {
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 'apk_name': 'AppRTCDemoTest', 399 'apk_name': 'AppRTCDemoTest',
399 'java_in_dir': 'examples/androidtests', 400 'java_in_dir': 'examples/androidtests',
400 'is_test_apk': 1, 401 'is_test_apk': 1,
401 }, 402 },
402 'includes': [ '../build/java_apk.gypi' ], 403 'includes': [ '../build/java_apk.gypi' ],
403 }, 404 },
404 ], # targets 405 ], # targets
405 }], # OS=="android" 406 }], # OS=="android"
406 ], 407 ],
407 } 408 }
OLDNEW
« no previous file with comments | « talk/libjingle_tests.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698