Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'includes': [ | 6 'includes': [ |
| 7 'icu.gypi', | 7 'icu.gypi', |
| 8 ], | 8 ], |
| 9 'variables': { | 9 'variables': { |
| 10 'use_system_icu%': 0, | 10 'use_system_icu%': 0, |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 229 ['OS == "android" and clang==0', { | 229 ['OS == "android" and clang==0', { |
| 230 # Disable sincos() optimization to avoid a linker error since | 230 # Disable sincos() optimization to avoid a linker error since |
| 231 # Android's math library doesn't have sincos(). Either | 231 # Android's math library doesn't have sincos(). Either |
| 232 # -fno-builtin-sin or -fno-builtin-cos works. | 232 # -fno-builtin-sin or -fno-builtin-cos works. |
| 233 'cflags': [ | 233 'cflags': [ |
| 234 '-fno-builtin-sin', | 234 '-fno-builtin-sin', |
| 235 ], | 235 ], |
| 236 }], | 236 }], |
| 237 [ 'OS == "win" and clang==1', { | 237 [ 'OS == "win" and clang==1', { |
| 238 # Note: General clang warnings should go in the | 238 # Note: General clang warnings should go in the |
| 239 # clang_warning_flags block above. | 239 # clang_warning_flags block above. |
|
Nico
2015/06/30 04:45:56
See this.
| |
| 240 'msvs_settings': { | 240 'msvs_settings': { |
| 241 'VCCLCompilerTool': { | 241 'VCCLCompilerTool': { |
| 242 'AdditionalOptions': [ | 242 'AdditionalOptions': [ |
| 243 # See http://bugs.icu-project.org/trac/ticket/11122 | 243 # See http://bugs.icu-project.org/trac/ticket/11122 |
| 244 '-Wno-inline-new-delete', | 244 '-Wno-inline-new-delete', |
| 245 '-Wno-implicit-exception-spec-mismatch', | 245 '-Wno-implicit-exception-spec-mismatch', |
| 246 '-Wno-parentheses', | |
| 246 ], | 247 ], |
| 247 }, | 248 }, |
| 248 }, | 249 }, |
| 249 }], | 250 }], |
| 250 ], # conditions | 251 ], # conditions |
| 251 }, | 252 }, |
| 252 { | 253 { |
| 253 'target_name': 'icuuc', | 254 'target_name': 'icuuc', |
| 254 'type': '<(component)', | 255 'type': '<(component)', |
| 255 'sources': [ | 256 'sources': [ |
| (...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 583 }, | 584 }, |
| 584 'includes': [ | 585 'includes': [ |
| 585 '../../build/shim_headers.gypi', | 586 '../../build/shim_headers.gypi', |
| 586 ], | 587 ], |
| 587 'toolsets': ['target'], | 588 'toolsets': ['target'], |
| 588 }, | 589 }, |
| 589 ], # targets | 590 ], # targets |
| 590 }], | 591 }], |
| 591 ], # conditions | 592 ], # conditions |
| 592 } | 593 } |
| OLD | NEW |