Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2015 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 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 330 '-Wextra', | 330 '-Wextra', |
| 331 ], | 331 ], |
| 332 'xcode_settings': { | 332 'xcode_settings': { |
| 333 'WARNING_CFLAGS!': ['-Wextra'], | 333 'WARNING_CFLAGS!': ['-Wextra'], |
| 334 }, | 334 }, |
| 335 }, { | 335 }, { |
| 336 'cflags': [ | 336 'cflags': [ |
| 337 '-Wno-maybe-uninitialized', # Only exists for GCC. | 337 '-Wno-maybe-uninitialized', # Only exists for GCC. |
| 338 ], | 338 ], |
| 339 }], | 339 }], |
| 340 # TODO(solenberg): Doesn't work adding the flag to 'rtc_api_objc'. Why? | |
|
tkchin_webrtc
2016/03/02 21:13:37
try sticking it in an all_dependent_settings block
the sun
2016/03/03 20:00:14
I didn't realize there were two targets with very
| |
| 341 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=5620 | |
| 342 ['OS=="mac"', { | |
| 343 'link_settings': { | |
| 344 'xcode_settings': { | |
| 345 'OTHER_LDFLAGS': [ | |
| 346 '-framework OpenGL', | |
| 347 ], | |
| 348 }, | |
| 349 }, | |
| 350 }], | |
| 340 ['OS=="win"', { | 351 ['OS=="win"', { |
| 341 # Disable warning for signed/unsigned mismatch. | 352 # Disable warning for signed/unsigned mismatch. |
| 342 'msvs_settings': { | 353 'msvs_settings': { |
| 343 'VCCLCompilerTool': { | 354 'VCCLCompilerTool': { |
| 344 'AdditionalOptions!': ['/we4389'], | 355 'AdditionalOptions!': ['/we4389'], |
| 345 }, | 356 }, |
| 346 }, | 357 }, |
| 347 }], | 358 }], |
| 348 ['OS=="win" and clang==1', { | 359 ['OS=="win" and clang==1', { |
| 349 'msvs_settings': { | 360 'msvs_settings': { |
| 350 'VCCLCompilerTool': { | 361 'VCCLCompilerTool': { |
| 351 'AdditionalOptions': [ | 362 'AdditionalOptions': [ |
| 352 '-Wno-sign-compare', | 363 '-Wno-sign-compare', |
| 353 ], | 364 ], |
| 354 }, | 365 }, |
| 355 }, | 366 }, |
| 356 }], | 367 }], |
| 357 ], | 368 ], |
| 358 }, # target libjingle_peerconnection | 369 }, # target libjingle_peerconnection |
| 359 ], # targets | 370 ], # targets |
| 360 } | 371 } |
| OLD | NEW |