| OLD | NEW |
| 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2014 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', ], |
| 11 'conditions': [ | 11 'conditions': [ |
| 12 ['os_posix == 1 and OS != "mac" and OS != "ios"', { | 12 ['os_posix == 1 and OS != "mac" and OS != "ios"', { |
| 13 'conditions': [ | 13 'conditions': [ |
| 14 ['sysroot!=""', { | 14 ['sysroot!=""', { |
| 15 'variables': { | 15 'variables': { |
| 16 'pkg-config': '../../../build/linux/pkg-config-wrapper "<(sysroot)"
"<(target_arch)"', | 16 'pkg-config': '../../../build/linux/pkg-config-wrapper "<(sysroot)"
"<(target_arch)"', |
| 17 }, | 17 }, |
| 18 }, { | 18 }, { |
| 19 'variables': { | 19 'variables': { |
| 20 'pkg-config': 'pkg-config' | 20 'pkg-config': 'pkg-config' |
| 21 }, | 21 }, |
| 22 }], | 22 }], |
| 23 ], | 23 ], |
| 24 }], | 24 }], |
| 25 # TODO(tkchin): Mac support. There are a bunch of problems right now because | 25 # TODO(tkchin): Mac support. There are a bunch of problems right now because |
| 26 # of some settings pulled down from Chromium. | 26 # of some settings pulled down from Chromium. |
| 27 ['OS=="ios"', { | 27 ['OS=="ios" or OS=="mac"', { |
| 28 'targets': [ | 28 'targets': [ |
| 29 { | 29 { |
| 30 'target_name': 'rtc_base_objc', | 30 'target_name': 'rtc_base_objc', |
| 31 'type': 'static_library', | 31 'type': 'static_library', |
| 32 'includes': [ '../build/objc_common.gypi' ], |
| 32 'dependencies': [ | 33 'dependencies': [ |
| 33 'rtc_base', | 34 'rtc_base', |
| 34 ], | 35 ], |
| 35 'sources': [ | 36 'sources': [ |
| 36 'objc/NSString+StdString.h', | 37 'objc/NSString+StdString.h', |
| 37 'objc/NSString+StdString.mm', | 38 'objc/NSString+StdString.mm', |
| 38 'objc/RTCDispatcher.h', | 39 'objc/RTCDispatcher.h', |
| 39 'objc/RTCDispatcher.m', | 40 'objc/RTCDispatcher.m', |
| 40 'objc/RTCLogging.h', | 41 'objc/RTCLogging.h', |
| 41 'objc/RTCLogging.mm', | 42 'objc/RTCLogging.mm', |
| (...skipping 11 matching lines...) Expand all Loading... |
| 53 ], | 54 ], |
| 54 'all_dependent_settings': { | 55 'all_dependent_settings': { |
| 55 'xcode_settings': { | 56 'xcode_settings': { |
| 56 'OTHER_LDFLAGS': [ | 57 'OTHER_LDFLAGS': [ |
| 57 '-framework AVFoundation', | 58 '-framework AVFoundation', |
| 58 ], | 59 ], |
| 59 }, | 60 }, |
| 60 }, | 61 }, |
| 61 }], | 62 }], |
| 62 ], | 63 ], |
| 63 'xcode_settings': { | |
| 64 'CLANG_ENABLE_OBJC_ARC': 'YES', | |
| 65 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES', | |
| 66 }, | |
| 67 } | 64 } |
| 68 ], | 65 ], |
| 69 }], # OS=="ios" | 66 }], # OS=="ios" |
| 70 ], | 67 ], |
| 71 'targets': [ | 68 'targets': [ |
| 72 { | 69 { |
| 73 # The subset of rtc_base approved for use outside of libjingle. | 70 # The subset of rtc_base approved for use outside of libjingle. |
| 74 'target_name': 'rtc_base_approved', | 71 'target_name': 'rtc_base_approved', |
| 75 'type': 'static_library', | 72 'type': 'static_library', |
| 76 'sources': [ | 73 'sources': [ |
| (...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 748 }, | 745 }, |
| 749 { | 746 { |
| 750 'target_name': 'gtest_prod', | 747 'target_name': 'gtest_prod', |
| 751 'type': 'static_library', | 748 'type': 'static_library', |
| 752 'sources': [ | 749 'sources': [ |
| 753 'gtest_prod_util.h', | 750 'gtest_prod_util.h', |
| 754 ], | 751 ], |
| 755 }, | 752 }, |
| 756 ], | 753 ], |
| 757 } | 754 } |
| OLD | NEW |