| OLD | NEW |
| 1 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2015 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 'includes': [ '../build/common.gypi', ], | 10 'includes': [ '../build/common.gypi', ], |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 ], | 58 ], |
| 59 'all_dependent_settings': { | 59 'all_dependent_settings': { |
| 60 'xcode_settings': { | 60 'xcode_settings': { |
| 61 'OTHER_LDFLAGS': [ | 61 'OTHER_LDFLAGS': [ |
| 62 '-framework CoreGraphics', | 62 '-framework CoreGraphics', |
| 63 '-framework GLKit', | 63 '-framework GLKit', |
| 64 '-framework OpenGLES', | 64 '-framework OpenGLES', |
| 65 '-framework QuartzCore', | 65 '-framework QuartzCore', |
| 66 ] | 66 ] |
| 67 } | 67 } |
| 68 } | 68 }, |
| 69 # TODO(kjellander): Make the code compile without disabling these. |
| 70 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307 |
| 71 'cflags': [ |
| 72 '-Wno-return-type', |
| 73 ], |
| 74 'xcode_settings': { |
| 75 'WARNING_CFLAGS': [ |
| 76 '-Wno-return-type', |
| 77 ], |
| 78 }, |
| 69 }], | 79 }], |
| 70 ['OS=="mac"', { | 80 ['OS=="mac"', { |
| 71 'sources': [ | 81 'sources': [ |
| 72 'objc/RTCNSGLVideoView.h', | 82 'objc/RTCNSGLVideoView.h', |
| 73 'objc/RTCNSGLVideoView.m', | 83 'objc/RTCNSGLVideoView.m', |
| 74 ], | 84 ], |
| 75 }], | 85 }], |
| 76 ], | 86 ], |
| 77 'xcode_settings': { | 87 'xcode_settings': { |
| 78 'CLANG_ENABLE_OBJC_ARC': 'YES', | 88 'CLANG_ENABLE_OBJC_ARC': 'YES', |
| 79 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES', | 89 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES', |
| 80 'GCC_PREFIX_HEADER': 'objc/WebRTC-Prefix.pch', | 90 'GCC_PREFIX_HEADER': 'objc/WebRTC-Prefix.pch', |
| 81 }, | 91 }, |
| 82 } | 92 } |
| 83 ], | 93 ], |
| 84 }], # OS=="ios" | 94 }], # OS=="ios" |
| 85 ], | 95 ], |
| 86 } | 96 } |
| OLD | NEW |