diff options
Diffstat (limited to 'webrtc/base/base.gyp')
| -rw-r--r-- | webrtc/base/base.gyp | 79 |
1 files changed, 73 insertions, 6 deletions
diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp index 4b6ad85362..c9182632ab 100644 --- a/webrtc/base/base.gyp +++ b/webrtc/base/base.gyp @@ -22,6 +22,46 @@ }], ], }], + # TODO(tkchin): Mac support. There are a bunch of problems right now because + # of some settings pulled down from Chromium. + ['OS=="ios"', { + 'targets': [ + { + 'target_name': 'rtc_base_objc', + 'type': 'static_library', + 'dependencies': [ + 'rtc_base', + ], + 'sources': [ + 'objc/NSString+StdString.h', + 'objc/NSString+StdString.mm', + 'objc/RTCDispatcher.h', + 'objc/RTCDispatcher.m', + 'objc/RTCLogging.h', + 'objc/RTCLogging.mm', + ], + 'conditions': [ + ['OS=="ios"', { + 'sources': [ + 'objc/RTCCameraPreviewView.h', + 'objc/RTCCameraPreviewView.m', + ], + 'all_dependent_settings': { + 'xcode_settings': { + 'OTHER_LDFLAGS': [ + '-framework AVFoundation', + ], + }, + }, + }], + ], + 'xcode_settings': { + 'CLANG_ENABLE_OBJC_ARC': 'YES', + 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES', + }, + } + ], + }], # OS=="ios" ], 'targets': [ { @@ -31,7 +71,6 @@ 'sources': [ 'array_view.h', 'atomicops.h', - 'basictypes.h', 'bitbuffer.cc', 'bitbuffer.h', 'buffer.cc', @@ -46,6 +85,7 @@ 'constructormagic.h', 'criticalsection.cc', 'criticalsection.h', + 'deprecation.h', 'event.cc', 'event.h', 'event_tracer.cc', @@ -54,15 +94,18 @@ 'exp_filter.h', 'logging.cc', 'logging.h', - 'maybe.h', 'md5.cc', 'md5.h', 'md5digest.cc', 'md5digest.h', + 'optional.h', 'platform_file.cc', 'platform_file.h', 'platform_thread.cc', 'platform_thread.h', + 'platform_thread_types.h', + 'random.cc', + 'random.h', 'ratetracker.cc', 'ratetracker.h', 'safe_conversions.h', @@ -85,9 +128,16 @@ ], 'conditions': [ ['build_with_chromium==1', { + 'dependencies': [ + '<(DEPTH)/base/base.gyp:base', + ], 'include_dirs': [ '../../webrtc_overrides', ], + 'sources': [ + '../../webrtc_overrides/webrtc/base/logging.cc', + '../../webrtc_overrides/webrtc/base/logging.h', + ], 'sources!': [ 'logging.cc', 'logging.h', @@ -102,6 +152,9 @@ '<(webrtc_root)/common.gyp:webrtc_common', 'rtc_base_approved', ], + 'export_dependent_settings': [ + 'rtc_base_approved', + ], 'defines': [ 'FEATURE_ENABLE_SSL', 'SSL_USE_OPENSSL', @@ -131,7 +184,6 @@ 'bandwidthsmoother.h', 'base64.cc', 'base64.h', - 'basicdefs.h', 'bind.h', 'callback.h', 'common.cc', @@ -172,6 +224,9 @@ 'httpserver.h', 'ifaddrs-android.cc', 'ifaddrs-android.h', + 'ifaddrs_converter.cc', + 'ifaddrs_converter.h', + 'macifaddrs_converter.cc', 'iosfilesystem.mm', 'ipaddress.cc', 'ipaddress.h', @@ -380,8 +435,6 @@ '../../boringssl/src/include', ], 'sources': [ - '../../webrtc_overrides/webrtc/base/logging.cc', - '../../webrtc_overrides/webrtc/base/logging.h', '../../webrtc_overrides/webrtc/base/win32socketinit.cc', ], 'sources!': [ @@ -390,7 +443,6 @@ 'bandwidthsmoother.h', 'bind.h', 'callback.h', - 'constructormagic.h', 'dbus.cc', 'dbus.h', 'diskcache_win32.cc', @@ -494,6 +546,17 @@ 'WEBRTC_EXTERNAL_JSON', ], }], + ['OS=="win" and clang==1', { + 'msvs_settings': { + 'VCCLCompilerTool': { + 'AdditionalOptions': [ + # Disable warnings failing when compiling with Clang on Windows. + # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366 + '-Wno-missing-braces', + ], + }, + }, + }], ], }], ['OS == "android"', { @@ -602,6 +665,9 @@ ], }], ['OS=="win"', { + 'sources!': [ + 'ifaddrs_converter.cc', + ], 'link_settings': { 'libraries': [ '-lcrypt32.lib', @@ -653,6 +719,7 @@ }], ['OS!="ios" and OS!="mac"', { 'sources!': [ + 'macifaddrs_converter.cc', 'scoped_autorelease_pool.mm', ], }], |