| 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 3880 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3891 '-Wno-c++11-narrowing', | 3891 '-Wno-c++11-narrowing', |
| 3892 | 3892 |
| 3893 # TODO(thakis): Remove, http://crbug.com/263960 | 3893 # TODO(thakis): Remove, http://crbug.com/263960 |
| 3894 '-Wno-reserved-user-defined-literal', | 3894 '-Wno-reserved-user-defined-literal', |
| 3895 | 3895 |
| 3896 # Clang considers the `register` keyword as deprecated, but e.g. | 3896 # Clang considers the `register` keyword as deprecated, but e.g. |
| 3897 # code generated by flex (used in angle) contains that keyword. | 3897 # code generated by flex (used in angle) contains that keyword. |
| 3898 # http://crbug.com/255186 | 3898 # http://crbug.com/255186 |
| 3899 '-Wno-deprecated-register', | 3899 '-Wno-deprecated-register', |
| 3900 ], | 3900 ], |
| 3901 'cflags!': [ | |
| 3902 # Clang doesn't seem to know know this flag. | |
| 3903 '-mfpmath=sse', | |
| 3904 ], | |
| 3905 'cflags_cc': [ | 3901 'cflags_cc': [ |
| 3906 # See the comment in the Mac section for what it takes to move | 3902 # See the comment in the Mac section for what it takes to move |
| 3907 # this to -std=c++11. | 3903 # this to -std=c++11. |
| 3908 '-std=gnu++11', | 3904 '-std=gnu++11', |
| 3909 ], | 3905 ], |
| 3910 }], | 3906 }], |
| 3911 ['clang==1 and clang_use_chrome_plugins==1', { | 3907 ['clang==1 and clang_use_chrome_plugins==1', { |
| 3912 'cflags': [ | 3908 'cflags': [ |
| 3913 '<@(clang_chrome_plugins_flags)', | 3909 '<@(clang_chrome_plugins_flags)', |
| 3914 ], | 3910 ], |
| (...skipping 1757 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5672 # settings in target dicts. SYMROOT is a special case, because many other | 5668 # settings in target dicts. SYMROOT is a special case, because many other |
| 5673 # Xcode variables depend on it, including variables such as | 5669 # Xcode variables depend on it, including variables such as |
| 5674 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5670 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5675 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5671 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5676 # files to appear (when present) in the UI as actual files and not red | 5672 # files to appear (when present) in the UI as actual files and not red |
| 5677 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5673 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5678 # and therefore SYMROOT, needs to be set at the project level. | 5674 # and therefore SYMROOT, needs to be set at the project level. |
| 5679 'SYMROOT': '<(DEPTH)/xcodebuild', | 5675 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5680 }, | 5676 }, |
| 5681 } | 5677 } |
| OLD | NEW |