| 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 2349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2360 # removed when we change to that. (This is also why we don't | 2360 # removed when we change to that. (This is also why we don't |
| 2361 # bother fixing all these cases today.) | 2361 # bother fixing all these cases today.) |
| 2362 '-Wno-unnamed-type-template-args', | 2362 '-Wno-unnamed-type-template-args', |
| 2363 # This (rightyfully) complains about 'override', which we use | 2363 # This (rightyfully) complains about 'override', which we use |
| 2364 # heavily. | 2364 # heavily. |
| 2365 '-Wno-c++11-extensions', | 2365 '-Wno-c++11-extensions', |
| 2366 | 2366 |
| 2367 # Warns on switches on enums that cover all enum values but | 2367 # Warns on switches on enums that cover all enum values but |
| 2368 # also contain a default: branch. Chrome is full of that. | 2368 # also contain a default: branch. Chrome is full of that. |
| 2369 '-Wno-covered-switch-default', | 2369 '-Wno-covered-switch-default', |
| 2370 |
| 2371 # TODO(thakis): Remove this. |
| 2372 '-Wno-implicit-conversion-floating-point-to-bool', |
| 2370 ], | 2373 ], |
| 2371 'cflags!': [ | 2374 'cflags!': [ |
| 2372 # Clang doesn't seem to know know this flag. | 2375 # Clang doesn't seem to know know this flag. |
| 2373 '-mfpmath=sse', | 2376 '-mfpmath=sse', |
| 2374 ], | 2377 ], |
| 2375 }], | 2378 }], |
| 2376 ['clang==1 and clang_use_chrome_plugins==1', { | 2379 ['clang==1 and clang_use_chrome_plugins==1', { |
| 2377 'cflags': [ | 2380 'cflags': [ |
| 2378 '<@(clang_chrome_plugins_flags)', | 2381 '<@(clang_chrome_plugins_flags)', |
| 2379 ], | 2382 ], |
| (...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2865 '-Wno-unused-function', | 2868 '-Wno-unused-function', |
| 2866 # See comments on this flag higher up in this file. | 2869 # See comments on this flag higher up in this file. |
| 2867 '-Wno-unnamed-type-template-args', | 2870 '-Wno-unnamed-type-template-args', |
| 2868 # This (rightyfully) complains about 'override', which we use | 2871 # This (rightyfully) complains about 'override', which we use |
| 2869 # heavily. | 2872 # heavily. |
| 2870 '-Wno-c++11-extensions', | 2873 '-Wno-c++11-extensions', |
| 2871 | 2874 |
| 2872 # Warns on switches on enums that cover all enum values but | 2875 # Warns on switches on enums that cover all enum values but |
| 2873 # also contain a default: branch. Chrome is full of that. | 2876 # also contain a default: branch. Chrome is full of that. |
| 2874 '-Wno-covered-switch-default', | 2877 '-Wno-covered-switch-default', |
| 2878 |
| 2879 # TODO(thakis): Remove this. |
| 2880 '-Wno-implicit-conversion-floating-point-to-bool', |
| 2875 ], | 2881 ], |
| 2876 }], | 2882 }], |
| 2877 ['clang==1 and clang_use_chrome_plugins==1', { | 2883 ['clang==1 and clang_use_chrome_plugins==1', { |
| 2878 'OTHER_CFLAGS': [ | 2884 'OTHER_CFLAGS': [ |
| 2879 '<@(clang_chrome_plugins_flags)', | 2885 '<@(clang_chrome_plugins_flags)', |
| 2880 ], | 2886 ], |
| 2881 }], | 2887 }], |
| 2882 ['clang==1 and clang_load!=""', { | 2888 ['clang==1 and clang_load!=""', { |
| 2883 'OTHER_CFLAGS': [ | 2889 'OTHER_CFLAGS': [ |
| 2884 '-Xclang', '-load', '-Xclang', '<(clang_load)', | 2890 '-Xclang', '-load', '-Xclang', '<(clang_load)', |
| (...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3410 # settings in target dicts. SYMROOT is a special case, because many other | 3416 # settings in target dicts. SYMROOT is a special case, because many other |
| 3411 # Xcode variables depend on it, including variables such as | 3417 # Xcode variables depend on it, including variables such as |
| 3412 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3418 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 3413 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3419 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 3414 # files to appear (when present) in the UI as actual files and not red | 3420 # files to appear (when present) in the UI as actual files and not red |
| 3415 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3421 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 3416 # and therefore SYMROOT, needs to be set at the project level. | 3422 # and therefore SYMROOT, needs to be set at the project level. |
| 3417 'SYMROOT': '<(DEPTH)/xcodebuild', | 3423 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 3418 }, | 3424 }, |
| 3419 } | 3425 } |
| OLD | NEW |