OLD | NEW |
1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2016 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 { | 9 { |
10 'includes': [ '../build/common.gypi', ], | 10 'includes': [ '../build/common.gypi', ], |
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
297 'cflags_cc!': [ | 297 'cflags_cc!': [ |
298 '-Wnon-virtual-dtor', | 298 '-Wnon-virtual-dtor', |
299 '-Woverloaded-virtual', | 299 '-Woverloaded-virtual', |
300 ], | 300 ], |
301 'msvs_disabled_warnings': [ | 301 'msvs_disabled_warnings': [ |
302 4245, # conversion from 'int' to 'uint32_t', signed/unsigned mismat
ch. | 302 4245, # conversion from 'int' to 'uint32_t', signed/unsigned mismat
ch. |
303 4389, # signed/unsigned mismatch. | 303 4389, # signed/unsigned mismatch. |
304 ], | 304 ], |
305 'conditions': [ | 305 'conditions': [ |
306 ['OS=="win"', { | 306 ['OS=="win"', { |
307 'conditions': [ | |
308 ['use_openssl==0', { | |
309 'dependencies': [ | |
310 '<(DEPTH)/net/third_party/nss/ssl.gyp:libssl', | |
311 '<(DEPTH)/third_party/nss/nss.gyp:nspr', | |
312 '<(DEPTH)/third_party/nss/nss.gyp:nss', | |
313 ], | |
314 }], | |
315 ], | |
316 'msvs_settings': { | 307 'msvs_settings': { |
317 'VCLinkerTool': { | 308 'VCLinkerTool': { |
318 'AdditionalDependencies': [ | 309 'AdditionalDependencies': [ |
319 # TODO(ronghuawu): Since we've included strmiids in | 310 # TODO(ronghuawu): Since we've included strmiids in |
320 # libjingle_media target, we shouldn't need this here. | 311 # libjingle_media target, we shouldn't need this here. |
321 # Find out why it doesn't work without this. | 312 # Find out why it doesn't work without this. |
322 'strmiids.lib', | 313 'strmiids.lib', |
323 ], | 314 ], |
324 }, | 315 }, |
325 }, | 316 }, |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
378 'sources': [ | 369 'sources': [ |
379 'rtc_media_unittests.isolate', | 370 'rtc_media_unittests.isolate', |
380 ], | 371 ], |
381 }, | 372 }, |
382 ], | 373 ], |
383 }], | 374 }], |
384 ], # conditions | 375 ], # conditions |
385 }], # include_tests==1 | 376 }], # include_tests==1 |
386 ], # conditions | 377 ], # conditions |
387 } | 378 } |
OLD | NEW |