| 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 1979 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1990 # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.htm
l | 1990 # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.htm
l |
| 1991 'mac_release_optimization%': '3', # Use -O3 unless overridden | 1991 'mac_release_optimization%': '3', # Use -O3 unless overridden |
| 1992 'mac_debug_optimization%': '0', # Use -O0 unless overridden | 1992 'mac_debug_optimization%': '0', # Use -O0 unless overridden |
| 1993 }], | 1993 }], |
| 1994 ], | 1994 ], |
| 1995 }, | 1995 }, |
| 1996 'defines': [ | 1996 'defines': [ |
| 1997 # Set this to use the new DX11 version of ANGLE. | 1997 # Set this to use the new DX11 version of ANGLE. |
| 1998 # TODO(apatrick): Remove this when the transition is complete. | 1998 # TODO(apatrick): Remove this when the transition is complete. |
| 1999 'ANGLE_DX11', | 1999 'ANGLE_DX11', |
| 2000 |
| 2001 # Don't use deprecated V8 APIs anywhere. |
| 2002 'V8_DEPRECATION_WARNINGS', |
| 2000 ], | 2003 ], |
| 2001 'conditions': [ | 2004 'conditions': [ |
| 2002 # TODO(jochen): Enable this unconditionally. | |
| 2003 ['OS!="mac"', { | |
| 2004 'defines': ['V8_DEPRECATION_WARNINGS'], | |
| 2005 }], | |
| 2006 ['(OS=="mac" or OS=="ios") and asan==1', { | 2005 ['(OS=="mac" or OS=="ios") and asan==1', { |
| 2007 'dependencies': [ | 2006 'dependencies': [ |
| 2008 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', | 2007 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', |
| 2009 ], | 2008 ], |
| 2010 }], | 2009 }], |
| 2011 ['OS=="linux" and linux_use_tcmalloc==1 and clang_type_profiler==1', { | 2010 ['OS=="linux" and linux_use_tcmalloc==1 and clang_type_profiler==1', { |
| 2012 'cflags_cc!': ['-fno-rtti'], | 2011 'cflags_cc!': ['-fno-rtti'], |
| 2013 'cflags_cc+': [ | 2012 'cflags_cc+': [ |
| 2014 '-frtti', | 2013 '-frtti', |
| 2015 '-gline-tables-only', | 2014 '-gline-tables-only', |
| (...skipping 2722 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4738 # settings in target dicts. SYMROOT is a special case, because many other | 4737 # settings in target dicts. SYMROOT is a special case, because many other |
| 4739 # Xcode variables depend on it, including variables such as | 4738 # Xcode variables depend on it, including variables such as |
| 4740 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4739 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4741 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4740 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4742 # files to appear (when present) in the UI as actual files and not red | 4741 # files to appear (when present) in the UI as actual files and not red |
| 4743 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4742 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4744 # and therefore SYMROOT, needs to be set at the project level. | 4743 # and therefore SYMROOT, needs to be set at the project level. |
| 4745 'SYMROOT': '<(DEPTH)/xcodebuild', | 4744 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4746 }, | 4745 }, |
| 4747 } | 4746 } |
| OLD | NEW |