commit f19180d509a31ee951cddd6c9ac697dc04c90de8
author kjellander@webrtc.org <kjellander@webrtc.org> Thu Jan 08 21:22:01 2015
committer kjellander@webrtc.org <kjellander@webrtc.org> Thu Jan 08 21:22:01 2015
tree 2d26931e78a8e26d6d1d95787c94e9f18193d41f
parent f48a09b7bc3625f662152125354e464e4554efdf

GN: Fix Windows build.

This required a tiny include fix in
src/third_party/winsdk_samples/src
which was committed in
https://code.google.com/p/webrtc/source/detail?r=7951

This incorporates contribution from vchigrin@yandex-team.ru
in https://webrtc-codereview.appspot.com/29299004/

BUG=261,1348,4105
R=pbos@webrtc.org
TBR=andrew@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/32889004

git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@8027 4adac7df-926f-26a2-2b94-8c16560cd09d

modules/audio_coding/BUILD.gn

diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index 994ff32..f4952a7 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -92,6 +92,13 @@
     configs -= [ "//build/config/clang:find_bad_constructs" ]
   }
 
+  if (is_win) {
+    cflags = [
+      # TODO(kjellander): Bug 261: fix this warning.
+      "/wd4373",  # virtual function override.
+    ]
+  }
+
   deps = [
     ":cng",
     ":g711",

modules/rtp_rtcp/BUILD.gn

diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index 65d5f38..f343e09 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -113,6 +113,8 @@
     cflags = [
       # TODO(jschuh): Bug 1348: fix this warning.
       "/wd4267",  # size_t to int truncations
+      # TODO(kjellander): Bug 261: fix this warning.
+      "/wd4373",  # virtual function override.
     ]
   }
 }

modules/video_coding/BUILD.gn

diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index eebd085..eaaeaa8 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -67,6 +67,13 @@
   configs += [ "../..:common_config" ]
   public_configs = [ "../..:common_inherited_config" ]
 
+  if (is_win) {
+    cflags = [
+      # TODO(jschuh): Bug 1348: fix this warning.
+      "/wd4267",  # size_t to int truncation.
+    ]
+  }
+
   if (is_clang) {
     # Suppress warnings from Chrome's Clang plugins.
     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
@@ -150,6 +157,13 @@
     configs -= [ "//build/config/clang:find_bad_constructs" ]
   }
 
+  if (is_win) {
+    cflags = [
+      # TODO(jschuh): Bug 1348: fix this warning.
+      "/wd4267",  # size_t to int truncation.
+    ]
+  }
+
   # TODO(kjellander): Remove once libvpx has changed it's libvpx_config to be
   # in direct_dependent_configs.
   configs += [ "//third_party/libvpx:libvpx_config" ]

video_engine/BUILD.gn

diff --git a/video_engine/BUILD.gn b/video_engine/BUILD.gn
index 90999a7..889e054 100644
--- a/video_engine/BUILD.gn
+++ b/video_engine/BUILD.gn
@@ -101,6 +101,8 @@
     cflags = [
       # TODO(jschuh): Bug 1348: fix size_t to int truncations.
       "/wd4267",  # size_t to int truncation.
+      # Bug 261.
+      "/wd4373",  # legacy warning for ignoring const / volatile in signatures.
     ]
   }
 

voice_engine/BUILD.gn

diff --git a/voice_engine/BUILD.gn b/voice_engine/BUILD.gn
index 126d2c8..3666bd5 100644
--- a/voice_engine/BUILD.gn
+++ b/voice_engine/BUILD.gn
@@ -82,6 +82,11 @@
 
   if (is_win) {
     defines = [ "WEBRTC_DRIFT_COMPENSATION_SUPPORTED" ]
+
+    cflags = [
+      # TODO(kjellander): Bug 261: fix this warning.
+      "/wd4373",  # virtual function override.
+    ]
   }
 
   configs += [ "..:common_config" ]