| OLD | NEW | 
|    1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. |    1 # Copyright (c) 2009 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 { |    5 { | 
|    6   'variables': { |    6   'variables': { | 
|    7     # .gyp files should set chromium_code to 1 if they build Chromium-specific |    7     # .gyp files should set chromium_code to 1 if they build Chromium-specific | 
|    8     # code, as opposed to external code.  This variable is used to control |    8     # code, as opposed to external code.  This variable is used to control | 
|    9     # such things as the set of warnings to enable, and whether warnings are |    9     # such things as the set of warnings to enable, and whether warnings are | 
|   10     # treated as errors. |   10     # treated as errors. | 
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  176         # compiler optimized the code, since the value is always kept |  176         # compiler optimized the code, since the value is always kept | 
|  177         # in its specified precision. |  177         # in its specified precision. | 
|  178         'cflags': [ |  178         'cflags': [ | 
|  179           '-m32', |  179           '-m32', | 
|  180           '-pthread', |  180           '-pthread', | 
|  181           '-march=pentium4', |  181           '-march=pentium4', | 
|  182           '-fno-exceptions', |  182           '-fno-exceptions', | 
|  183           '-msse2', |  183           '-msse2', | 
|  184           '-mfpmath=sse', |  184           '-mfpmath=sse', | 
|  185           '-Wall', |  185           '-Wall', | 
|  186           '-Werror', |  186           # TODO(sgk): when chromium_code targets are clean of warnings. | 
 |  187           #'-Werror', | 
|  187         ], |  188         ], | 
|  188         'ldflags': [ |  189         'ldflags': [ | 
|  189           '-m32', |  190           '-m32', | 
|  190           '-pthread', |  191           '-pthread', | 
|  191         ], |  192         ], | 
|  192         'scons_variable_settings': { |  193         'scons_variable_settings': { | 
|  193           'LIBPATH': ['$LIB_DIR'], |  194           'LIBPATH': ['$LIB_DIR'], | 
|  194           # Linking of large files uses lots of RAM, so serialize links |  195           # Linking of large files uses lots of RAM, so serialize links | 
|  195           # using the handy flock command from util-linux. |  196           # using the handy flock command from util-linux. | 
|  196           'FLOCK_LINK': ['flock', '$TOP_BUILDDIR/linker.lock', '$LINK'], |  197           'FLOCK_LINK': ['flock', '$TOP_BUILDDIR/linker.lock', '$LINK'], | 
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  427     # settings in target dicts.  SYMROOT is a special case, because many other |  428     # settings in target dicts.  SYMROOT is a special case, because many other | 
|  428     # Xcode variables depend on it, including variables such as |  429     # Xcode variables depend on it, including variables such as | 
|  429     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something |  430     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
|  430     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |  431     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
|  431     # files to appear (when present) in the UI as actual files and not red |  432     # files to appear (when present) in the UI as actual files and not red | 
|  432     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |  433     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
|  433     # and therefore SYMROOT, needs to be set at the project level. |  434     # and therefore SYMROOT, needs to be set at the project level. | 
|  434     'SYMROOT': '<(DEPTH)/xcodebuild', |  435     'SYMROOT': '<(DEPTH)/xcodebuild', | 
|  435   }, |  436   }, | 
|  436 } |  437 } | 
| OLD | NEW |