| 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 if (is_win) { |    9 if (is_win) { | 
|   10   baseclasses_dir = "src/Samples/multimedia/directshow/baseclasses" |   10   baseclasses_dir = "src/Samples/multimedia/directshow/baseclasses" | 
|   11  |   11  | 
|   12   config("winsdk_samples_config") { |   12   config("winsdk_samples_config") { | 
|   13     include_dirs = [ baseclasses_dir ] |   13     include_dirs = [ baseclasses_dir ] | 
|   14   } |   14   } | 
|   15  |   15  | 
 |   16   config("winsdk_samples_warnings_config") { | 
 |   17     if (is_win && is_clang) { | 
 |   18       cflags = [ | 
 |   19         # Disable warnings failing when compiling with Clang on Windows. | 
 |   20         # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366 | 
 |   21         "-Wno-comment", | 
 |   22         "-Wno-delete-non-virtual-dtor", | 
 |   23         "-Wno-ignored-attributes", | 
 |   24         "-Wno-logical-op-parentheses", | 
 |   25         "-Wno-non-pod-varargs", | 
 |   26         "-Wno-microsoft-extra-qualification", | 
 |   27         "-Wno-missing-braces", | 
 |   28         "-Wno-overloaded-virtual", | 
 |   29         "-Wno-parentheses", | 
 |   30         "-Wno-reorder", | 
 |   31         "-Wno-string-conversion", | 
 |   32         "-Wno-tautological-constant-out-of-range-compare", | 
 |   33         "-Wno-unused-private-field", | 
 |   34         "-Wno-writable-strings", | 
 |   35       ] | 
 |   36     } | 
 |   37   } | 
 |   38  | 
|   16   static_library("winsdk_samples") { |   39   static_library("winsdk_samples") { | 
|   17     sources = [ |   40     sources = [ | 
|   18       "$baseclasses_dir/amextra.cpp", |   41       "$baseclasses_dir/amextra.cpp", | 
|   19       "$baseclasses_dir/amextra.h", |   42       "$baseclasses_dir/amextra.h", | 
|   20       "$baseclasses_dir/amfilter.cpp", |   43       "$baseclasses_dir/amfilter.cpp", | 
|   21       "$baseclasses_dir/amfilter.h", |   44       "$baseclasses_dir/amfilter.h", | 
|   22       "$baseclasses_dir/amvideo.cpp", |   45       "$baseclasses_dir/amvideo.cpp", | 
|   23       "$baseclasses_dir/cache.h", |   46       "$baseclasses_dir/cache.h", | 
|   24       "$baseclasses_dir/combase.cpp", |   47       "$baseclasses_dir/combase.cpp", | 
|   25       "$baseclasses_dir/combase.h", |   48       "$baseclasses_dir/combase.h", | 
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   77       "$baseclasses_dir/wxutil.cpp", |  100       "$baseclasses_dir/wxutil.cpp", | 
|   78       "$baseclasses_dir/wxutil.h", |  101       "$baseclasses_dir/wxutil.h", | 
|   79     ] |  102     ] | 
|   80  |  103  | 
|   81     public_configs = [ ":winsdk_samples_config" ] |  104     public_configs = [ ":winsdk_samples_config" ] | 
|   82  |  105  | 
|   83     configs -= [ |  106     configs -= [ | 
|   84       "//build/config/compiler:chromium_code", |  107       "//build/config/compiler:chromium_code", | 
|   85       "//build/config/win:nominmax", |  108       "//build/config/win:nominmax", | 
|   86     ] |  109     ] | 
|   87     configs += [ "//build/config/compiler:no_chromium_code" ] |  110     configs += [ | 
|   88     if (is_win && is_clang) { |  111       "//build/config/compiler:no_chromium_code", | 
|   89       cflags += [ |  112       ":winsdk_samples_warnings_config", | 
|   90         # Disable warnings failing when compiling with Clang on Windows. |  113     ] | 
|   91         # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366 |  | 
|   92         "-Wno-comment", |  | 
|   93         "-Wno-delete-non-virtual-dtor", |  | 
|   94         "-Wno-ignored-attributes", |  | 
|   95         "-Wno-logical-op-parentheses", |  | 
|   96         "-Wno-non-pod-varargs", |  | 
|   97         "-Wno-microsoft-extra-qualification", |  | 
|   98         "-Wno-missing-braces", |  | 
|   99         "-Wno-overloaded-virtual", |  | 
|  100         "-Wno-parentheses", |  | 
|  101         "-Wno-reorder", |  | 
|  102         "-Wno-string-conversion", |  | 
|  103         "-Wno-tautological-constant-out-of-range-compare", |  | 
|  104         "-Wno-unused-private-field", |  | 
|  105         "-Wno-writable-strings", |  | 
|  106       ] |  | 
|  107     } |  | 
|  108   } |  114   } | 
|  109 } |  115 } | 
| OLD | NEW |