admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable warnings failing when using Clang on Windows.

Browse Source 
This makes it possible to build WebRTC using Clang on Windows.
Depends on https://codereview.webrtc.org/1524703006/

BUG=webrtc:5360, webrtc:5366
NOTRY=True

Review URL: https://codereview.webrtc.org/1522223002

Cr-Commit-Position: refs/heads/master@{#11058}
This commit is contained in:
kjellander 2015-12-16 14:05:29 -08:00 committed by Commit bot
parent 9f58795cec
commit 7cae30cbe1
12 changed files with 180 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -24,7 +24,7 @@ deps = {
deps_os = {
'win': {
'src/third_party/winsdk_samples/src':
Var('chromium_git') + '/external/webrtc/deps/third_party/winsdk_samples_v71@c0cbedd854cb610a53226d9817416c4ab9a7d1e9', # from svn revision 7951
Var('chromium_git') + '/external/webrtc/deps/third_party/winsdk_samples_v71@e71b549167a665d7424d6f1dadfbff4b4aad1589',
},
}

22
talk/libjingle_tests.gyp
View File

@ -128,6 +128,17 @@
},
},
}],
['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-unused-function',
],
},
},
},],
['OS=="ios"', {
'sources!': [
'media/sctp/sctpdataengine_unittest.cc',
@ -240,6 +251,17 @@
'GTEST_HAS_TR1_TUPLE=1',
],
}],
['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-unused-function',
],
},
},
}],
],
}, # target libjingle_peerconnection_unittest
],

26
third_party/winsdk_samples/winsdk_samples.gyp vendored
View File

@ -85,6 +85,32 @@
'<(baseclasses_dir)/wxutil.cpp',
'<(baseclasses_dir)/wxutil.h',
],
'conditions': [
['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-comment',
'-Wno-delete-non-virtual-dtor',
'-Wno-ignored-attributes',
'-Wno-logical-op-parentheses',
'-Wno-non-pod-varargs',
'-Wno-microsoft-extra-qualification',
'-Wno-missing-braces',
'-Wno-overloaded-virtual',
'-Wno-parentheses',
'-Wno-reorder',
'-Wno-string-conversion',
'-Wno-tautological-constant-out-of-range-compare',
'-Wno-unused-private-field',
'-Wno-writable-strings',
],
},
},
},],
], # conditions.
},
],
}

11
webrtc/base/base.gyp
View File

@ -541,6 +541,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"', {

12
webrtc/base/base_tests.gyp
View File

@ -134,6 +134,18 @@
'win32windowpicker_unittest.cc',
],
}],
['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',
'-Wno-unused-const-variable',
],
},
},
}],
['OS=="mac"', {
'sources': [
'macutils_unittest.cc',

14
webrtc/modules/audio_coding/codecs/isac/isac_test.gypi
View File

@ -25,6 +25,19 @@
'./main/test/simpleKenny.c',
'./main/util/utility.c',
],
'conditions': [
['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-format',
],
},
},
}],
], # conditions.
},
# ReleaseTest-API
{
@ -63,6 +76,5 @@
'./main/util/utility.c',
],
},
],
}

25
webrtc/modules/audio_device/audio_device.gypi
View File

@ -194,6 +194,27 @@
],
},
}],
['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
@ -205,8 +226,8 @@
'targets': [
{
'target_name': 'audio_device_tests',
'type': 'executable',
'dependencies': [
'type': 'executable',
'dependencies': [
'audio_device',
'webrtc_utility',
'<(webrtc_root)/test/test.gyp:test_support_main',

17
webrtc/modules/video_capture/video_capture.gypi
View File

@ -116,6 +116,23 @@
],
},
}], # win
['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-comment',
'-Wno-ignored-attributes',
'-Wno-microsoft-extra-qualification',
'-Wno-missing-braces',
'-Wno-overloaded-virtual',
'-Wno-reorder',
'-Wno-writable-strings',
],
},
},
}],
['OS=="ios"', {
'sources': [
'ios/device_info_ios.h',

14
webrtc/modules/video_render/video_render.gypi
View File

@ -149,6 +149,20 @@
'<(directx_sdk_path)/Include',
],
}],
['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-comment',
'-Wno-reorder',
'-Wno-unused-value',
'-Wno-unused-private-field',
],
},
},
}],
] # conditions
},
],

16
webrtc/test/test.gyp
View File

@ -41,6 +41,22 @@
'channel_transport/udp_transport_impl.cc',
'channel_transport/udp_transport_impl.h',
],
'conditions': [
['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-parentheses-equality',
'-Wno-reorder',
'-Wno-tautological-constant-out-of-range-compare',
'-Wno-unused-private-field',
],
},
},
}],
], # conditions.
},
{
'target_name': 'frame_generator',

13
webrtc/test/webrtc_test_common.gyp
View File

@ -115,6 +115,19 @@
'<(directx_sdk_path)/Include',
],
}],
['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-comment',
'-Wno-delete-non-virtual-dtor',
],
},
},
}],
],
'dependencies': [
'<(DEPTH)/testing/gtest.gyp:gtest',

12
webrtc/webrtc_examples.gyp
View File

@ -103,6 +103,18 @@
},
},
}], # OS=="win"
['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-reorder',
'-Wno-unused-function',
],
},
},
}], # OS=="win" and clang==1
['OS=="linux"', {
'sources': [
'examples/peerconnection/client/linux/main.cc',