diff options
Diffstat (limited to 'webrtc/modules/audio_device/audio_device.gypi')
-rw-r--r-- | webrtc/modules/audio_device/audio_device.gypi | 118 |
1 files changed, 75 insertions, 43 deletions
diff --git a/webrtc/modules/audio_device/audio_device.gypi b/webrtc/modules/audio_device/audio_device.gypi index 0678d33802..2db9f1e17b 100644 --- a/webrtc/modules/audio_device/audio_device.gypi +++ b/webrtc/modules/audio_device/audio_device.gypi @@ -20,13 +20,13 @@ ], 'include_dirs': [ '.', - '../interface', + '../include', 'include', 'dummy', # Contains dummy audio device implementations. ], 'direct_dependent_settings': { 'include_dirs': [ - '../interface', + '../include', 'include', ], }, @@ -86,48 +86,26 @@ }], ['include_internal_audio_device==1', { 'sources': [ - 'android/audio_device_template.h', - 'android/audio_manager.cc', - 'android/audio_manager.h', - 'android/audio_record_jni.cc', - 'android/audio_record_jni.h', - 'android/audio_track_jni.cc', - 'android/audio_track_jni.h', - 'android/build_info.cc', - 'android/build_info.h', - 'android/opensles_common.cc', - 'android/opensles_common.h', - 'android/opensles_player.cc', - 'android/opensles_player.h', 'audio_device_impl.cc', 'audio_device_impl.h', - 'ios/audio_device_ios.h', - 'ios/audio_device_ios.mm', - 'ios/audio_device_not_implemented_ios.mm', - 'linux/alsasymboltable_linux.cc', - 'linux/alsasymboltable_linux.h', - 'linux/audio_device_alsa_linux.cc', - 'linux/audio_device_alsa_linux.h', - 'linux/audio_mixer_manager_alsa_linux.cc', - 'linux/audio_mixer_manager_alsa_linux.h', - 'linux/latebindingsymboltable_linux.cc', - 'linux/latebindingsymboltable_linux.h', - 'mac/audio_device_mac.cc', - 'mac/audio_device_mac.h', - 'mac/audio_mixer_manager_mac.cc', - 'mac/audio_mixer_manager_mac.h', - 'mac/portaudio/pa_memorybarrier.h', - 'mac/portaudio/pa_ringbuffer.c', - 'mac/portaudio/pa_ringbuffer.h', - 'win/audio_device_core_win.cc', - 'win/audio_device_core_win.h', - 'win/audio_device_wave_win.cc', - 'win/audio_device_wave_win.h', - 'win/audio_mixer_manager_win.cc', - 'win/audio_mixer_manager_win.h', ], 'conditions': [ ['OS=="android"', { + 'sources': [ + 'android/audio_device_template.h', + 'android/audio_manager.cc', + 'android/audio_manager.h', + 'android/audio_record_jni.cc', + 'android/audio_record_jni.h', + 'android/audio_track_jni.cc', + 'android/audio_track_jni.h', + 'android/build_info.cc', + 'android/build_info.h', + 'android/opensles_common.cc', + 'android/opensles_common.h', + 'android/opensles_player.cc', + 'android/opensles_player.h', + ], 'link_settings': { 'libraries': [ '-llog', @@ -136,6 +114,16 @@ }, }], ['OS=="linux"', { + 'sources': [ + 'linux/alsasymboltable_linux.cc', + 'linux/alsasymboltable_linux.h', + 'linux/audio_device_alsa_linux.cc', + 'linux/audio_device_alsa_linux.h', + 'linux/audio_mixer_manager_alsa_linux.cc', + 'linux/audio_mixer_manager_alsa_linux.h', + 'linux/latebindingsymboltable_linux.cc', + 'linux/latebindingsymboltable_linux.h', + ], 'defines': [ 'LINUX_ALSA', ], @@ -161,6 +149,15 @@ ], }], ['OS=="mac"', { + 'sources': [ + 'mac/audio_device_mac.cc', + 'mac/audio_device_mac.h', + 'mac/audio_mixer_manager_mac.cc', + 'mac/audio_mixer_manager_mac.h', + 'mac/portaudio/pa_memorybarrier.h', + 'mac/portaudio/pa_ringbuffer.c', + 'mac/portaudio/pa_ringbuffer.h', + ], 'link_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework', @@ -169,6 +166,11 @@ }, }], ['OS=="ios"', { + 'sources': [ + 'ios/audio_device_ios.h', + 'ios/audio_device_ios.mm', + 'ios/audio_device_not_implemented_ios.mm', + ], 'xcode_settings': { 'CLANG_ENABLE_OBJC_ARC': 'YES', }, @@ -184,6 +186,14 @@ }, }], ['OS=="win"', { + 'sources': [ + 'win/audio_device_core_win.cc', + 'win/audio_device_core_win.h', + 'win/audio_device_wave_win.cc', + 'win/audio_device_wave_win.h', + 'win/audio_mixer_manager_win.cc', + 'win/audio_mixer_manager_win.h', + ], 'link_settings': { 'libraries': [ # Required for the built-in WASAPI AEC. @@ -194,18 +204,40 @@ ], }, }], + ['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-bool-conversion', + '-Wno-delete-non-virtual-dtor', + '-Wno-logical-op-parentheses', + '-Wno-microsoft-extra-qualification', + '-Wno-microsoft-goto', + '-Wno-missing-braces', + '-Wno-parentheses-equality', + '-Wno-reorder', + '-Wno-shift-overflow', + '-Wno-tautological-compare', + '-Wno-unused-private-field', + ], + }, + }, + }], ], # conditions }], # include_internal_audio_device==1 ], # conditions }, ], 'conditions': [ - ['include_tests==1', { + # Does not compile on iOS: webrtc:4755. + ['include_tests==1 and OS!="ios"', { 'targets': [ { 'target_name': 'audio_device_tests', - 'type': 'executable', - 'dependencies': [ + 'type': 'executable', + 'dependencies': [ 'audio_device', 'webrtc_utility', '<(webrtc_root)/test/test.gyp:test_support_main', @@ -236,7 +268,7 @@ ], }, ], # targets - }], # include_tests + }], # include_tests==1 and OS!=ios ], } |