| 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 # IMPORTANT: | 5 # IMPORTANT: |
| 6 # Please don't directly include this file if you are building via gyp_chromium, | 6 # Please don't directly include this file if you are building via gyp_chromium, |
| 7 # since gyp_chromium is automatically forcing its inclusion. | 7 # since gyp_chromium is automatically forcing its inclusion. |
| 8 { | 8 { |
| 9 # Variables expected to be overriden on the GYP command line (-D) or by | 9 # Variables expected to be overriden on the GYP command line (-D) or by |
| 10 # ~/.gyp/include.gypi. | 10 # ~/.gyp/include.gypi. |
| (...skipping 5458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5469 }], | 5469 }], |
| 5470 ['_type=="executable" and ">(win_exe_compatibility_manifest)"!=""',
{ | 5470 ['_type=="executable" and ">(win_exe_compatibility_manifest)"!=""',
{ |
| 5471 'VCManifestTool': { | 5471 'VCManifestTool': { |
| 5472 'AdditionalManifestFiles': [ | 5472 'AdditionalManifestFiles': [ |
| 5473 '>(win_exe_compatibility_manifest)', | 5473 '>(win_exe_compatibility_manifest)', |
| 5474 ], | 5474 ], |
| 5475 }, | 5475 }, |
| 5476 }], | 5476 }], |
| 5477 ], | 5477 ], |
| 5478 'conditions': [ | 5478 'conditions': [ |
| 5479 # Building with Clang on Windows is a work in progress and very |
| 5480 # experimental. See crbug.com/82385. |
| 5479 ['clang==1', { | 5481 ['clang==1', { |
| 5480 # Building with Clang on Windows is a work in progress and very | |
| 5481 # experimental. See crbug.com/82385. | |
| 5482 'VCCLCompilerTool': { | 5482 'VCCLCompilerTool': { |
| 5483 'WarnAsError': 'false', | |
| 5484 'RuntimeTypeInfo': 'false', | |
| 5485 'AdditionalOptions': [ | 5483 'AdditionalOptions': [ |
| 5486 '-fmsc-version=1800', | 5484 '-fmsc-version=1800', |
| 5487 '/fallback', | |
| 5488 | 5485 |
| 5489 # Many files use intrinsics without including this header. | 5486 # Many files use intrinsics without including this header. |
| 5490 # TODO(hans): Fix those files, or move this to sub-GYPs. | 5487 # TODO(hans): Fix those files, or move this to sub-GYPs. |
| 5491 '/FIIntrin.h', | 5488 '/FIIntrin.h', |
| 5492 | 5489 |
| 5493 # TODO(hans): Make this list shorter eventually. | 5490 # TODO(hans): Make this list shorter eventually. |
| 5494 '-Qunused-arguments', | 5491 '-Qunused-arguments', |
| 5495 '-Wno-c++11-compat-deprecated-writable-strings', | 5492 '-Wno-c++11-compat-deprecated-writable-strings', |
| 5496 '-Wno-deprecated-declarations', | 5493 '-Wno-deprecated-declarations', |
| 5497 '-Wno-empty-body', | 5494 '-Wno-empty-body', |
| (...skipping 22 matching lines...) Expand all Loading... |
| 5520 '-Wno-unsequenced', | 5517 '-Wno-unsequenced', |
| 5521 '-Wno-unused-function', | 5518 '-Wno-unused-function', |
| 5522 '-Wno-unused-private-field', | 5519 '-Wno-unused-private-field', |
| 5523 '-Wno-unused-value', | 5520 '-Wno-unused-value', |
| 5524 '-Wno-unused-variable', | 5521 '-Wno-unused-variable', |
| 5525 '-Wno-unused-local-typedef', # http://crbug.com/411648 | 5522 '-Wno-unused-local-typedef', # http://crbug.com/411648 |
| 5526 '-Wno-inconsistent-missing-override', #http://crbug.com/428099 | 5523 '-Wno-inconsistent-missing-override', #http://crbug.com/428099 |
| 5527 ], | 5524 ], |
| 5528 }, | 5525 }, |
| 5529 }], | 5526 }], |
| 5527 ['clang==1 and target_arch=="ia32"', { |
| 5528 'VCCLCompilerTool': { |
| 5529 'WarnAsError': 'false', |
| 5530 'AdditionalOptions': [ |
| 5531 '/fallback', |
| 5532 ], |
| 5533 }, |
| 5534 }], |
| 5530 ], | 5535 ], |
| 5531 }, | 5536 }, |
| 5532 }, | 5537 }, |
| 5533 }], | 5538 }], |
| 5534 ['disable_nacl==1', { | 5539 ['disable_nacl==1', { |
| 5535 'target_defaults': { | 5540 'target_defaults': { |
| 5536 'defines': [ | 5541 'defines': [ |
| 5537 'DISABLE_NACL', | 5542 'DISABLE_NACL', |
| 5538 ], | 5543 ], |
| 5539 }, | 5544 }, |
| (...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5867 # settings in target dicts. SYMROOT is a special case, because many other | 5872 # settings in target dicts. SYMROOT is a special case, because many other |
| 5868 # Xcode variables depend on it, including variables such as | 5873 # Xcode variables depend on it, including variables such as |
| 5869 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5874 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5870 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5875 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5871 # files to appear (when present) in the UI as actual files and not red | 5876 # files to appear (when present) in the UI as actual files and not red |
| 5872 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5877 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5873 # and therefore SYMROOT, needs to be set at the project level. | 5878 # and therefore SYMROOT, needs to be set at the project level. |
| 5874 'SYMROOT': '<(DEPTH)/xcodebuild', | 5879 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5875 }, | 5880 }, |
| 5876 } | 5881 } |
| OLD | NEW |