| 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 2095 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2106 # WebKit uses nullptr in a legit way, other that that this warning | 2106 # WebKit uses nullptr in a legit way, other that that this warning |
| 2107 # doesn't fire. | 2107 # doesn't fire. |
| 2108 '-Wno-c++11-compat', | 2108 '-Wno-c++11-compat', |
| 2109 # This (rightyfully) complains about 'override', which we use | 2109 # This (rightyfully) complains about 'override', which we use |
| 2110 # heavily. | 2110 # heavily. |
| 2111 '-Wno-c++11-extensions', | 2111 '-Wno-c++11-extensions', |
| 2112 | 2112 |
| 2113 # Warns on switches on enums that cover all enum values but | 2113 # Warns on switches on enums that cover all enum values but |
| 2114 # also contain a default: branch. Chrome is full of that. | 2114 # also contain a default: branch. Chrome is full of that. |
| 2115 '-Wno-covered-switch-default', | 2115 '-Wno-covered-switch-default', |
| 2116 | |
| 2117 # TODO(thakis): Reenable once http://webk.it/83920 is fixed. | |
| 2118 '-Wno-literal-conversion', | |
| 2119 ], | 2116 ], |
| 2120 'cflags!': [ | 2117 'cflags!': [ |
| 2121 # Clang doesn't seem to know know this flag. | 2118 # Clang doesn't seem to know know this flag. |
| 2122 '-mfpmath=sse', | 2119 '-mfpmath=sse', |
| 2123 ], | 2120 ], |
| 2124 }], | 2121 }], |
| 2125 ['clang==1 and clang_use_chrome_plugins==1', { | 2122 ['clang==1 and clang_use_chrome_plugins==1', { |
| 2126 'cflags': [ | 2123 'cflags': [ |
| 2127 '<(clang_chrome_plugins_flags)', | 2124 '<(clang_chrome_plugins_flags)', |
| 2128 ], | 2125 ], |
| (...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2523 # WebKit uses nullptr in a legit way, other that that this | 2520 # WebKit uses nullptr in a legit way, other that that this |
| 2524 # warning doesn't fire. | 2521 # warning doesn't fire. |
| 2525 '-Wno-c++0x-compat', | 2522 '-Wno-c++0x-compat', |
| 2526 # This (rightyfully) complains about 'override', which we use | 2523 # This (rightyfully) complains about 'override', which we use |
| 2527 # heavily. | 2524 # heavily. |
| 2528 '-Wno-c++11-extensions', | 2525 '-Wno-c++11-extensions', |
| 2529 | 2526 |
| 2530 # Warns on switches on enums that cover all enum values but | 2527 # Warns on switches on enums that cover all enum values but |
| 2531 # also contain a default: branch. Chrome is full of that. | 2528 # also contain a default: branch. Chrome is full of that. |
| 2532 '-Wno-covered-switch-default', | 2529 '-Wno-covered-switch-default', |
| 2533 | |
| 2534 # TODO(thakis): Reenable once http://webk.it/83920 is fixed. | |
| 2535 '-Wno-literal-conversion', | |
| 2536 ], | 2530 ], |
| 2537 }], | 2531 }], |
| 2538 ['clang==1 and clang_use_chrome_plugins==1', { | 2532 ['clang==1 and clang_use_chrome_plugins==1', { |
| 2539 'OTHER_CFLAGS': [ | 2533 'OTHER_CFLAGS': [ |
| 2540 '<(clang_chrome_plugins_flags)', | 2534 '<(clang_chrome_plugins_flags)', |
| 2541 ], | 2535 ], |
| 2542 }], | 2536 }], |
| 2543 ['clang==1 and clang_load!=""', { | 2537 ['clang==1 and clang_load!=""', { |
| 2544 'OTHER_CFLAGS': [ | 2538 'OTHER_CFLAGS': [ |
| 2545 '-Xclang', '-load', '-Xclang', '<(clang_load)', | 2539 '-Xclang', '-load', '-Xclang', '<(clang_load)', |
| (...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3008 # settings in target dicts. SYMROOT is a special case, because many other | 3002 # settings in target dicts. SYMROOT is a special case, because many other |
| 3009 # Xcode variables depend on it, including variables such as | 3003 # Xcode variables depend on it, including variables such as |
| 3010 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3004 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 3011 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3005 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 3012 # files to appear (when present) in the UI as actual files and not red | 3006 # files to appear (when present) in the UI as actual files and not red |
| 3013 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3007 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 3014 # and therefore SYMROOT, needs to be set at the project level. | 3008 # and therefore SYMROOT, needs to be set at the project level. |
| 3015 'SYMROOT': '<(DEPTH)/xcodebuild', | 3009 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 3016 }, | 3010 }, |
| 3017 } | 3011 } |
| OLD | NEW |