| 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 # 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': { | 9 'variables': { |
| 10 # .gyp files should set chromium_code to 1 if they build Chromium-specific | 10 # .gyp files should set chromium_code to 1 if they build Chromium-specific |
| (...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 347 'configurations': { | 347 'configurations': { |
| 348 # VCLinkerTool LinkIncremental values below: | 348 # VCLinkerTool LinkIncremental values below: |
| 349 # 0 == default | 349 # 0 == default |
| 350 # 1 == /INCREMENTAL:NO | 350 # 1 == /INCREMENTAL:NO |
| 351 # 2 == /INCREMENTAL | 351 # 2 == /INCREMENTAL |
| 352 # Debug links incremental, Release does not. | 352 # Debug links incremental, Release does not. |
| 353 'Debug': { | 353 'Debug': { |
| 354 'xcode_settings': { | 354 'xcode_settings': { |
| 355 'COPY_PHASE_STRIP': 'NO', | 355 'COPY_PHASE_STRIP': 'NO', |
| 356 'GCC_OPTIMIZATION_LEVEL': '<(mac_debug_optimization)', | 356 'GCC_OPTIMIZATION_LEVEL': '<(mac_debug_optimization)', |
| 357 'OTHER_CFLAGS': [ | 357 'OTHER_CFLAGS': [ '<@(debug_extra_cflags)', ], |
| 358 '-fstack-protector', | |
| 359 '-fstack-protector-all', | |
| 360 '<@(debug_extra_cflags)', | |
| 361 ], | |
| 362 }, | 358 }, |
| 363 'conditions': [ | 359 'conditions': [ |
| 364 [ 'OS=="win"', { | 360 [ 'OS=="win"', { |
| 365 'configuration_platform': 'Win32', | 361 'configuration_platform': 'Win32', |
| 366 'msvs_configuration_attributes': { | 362 'msvs_configuration_attributes': { |
| 367 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)', | 363 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)', |
| 368 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', | 364 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', |
| 369 'CharacterSet': '1', | 365 'CharacterSet': '1', |
| 370 }, | 366 }, |
| 371 'msvs_settings': { | 367 'msvs_settings': { |
| (...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 940 # and therefore SYMROOT, needs to be set at the project level. | 936 # and therefore SYMROOT, needs to be set at the project level. |
| 941 'SYMROOT': '<(DEPTH)/xcodebuild', | 937 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 942 }, | 938 }, |
| 943 } | 939 } |
| 944 | 940 |
| 945 # Local Variables: | 941 # Local Variables: |
| 946 # tab-width:2 | 942 # tab-width:2 |
| 947 # indent-tabs-mode:nil | 943 # indent-tabs-mode:nil |
| 948 # End: | 944 # End: |
| 949 # vim: set expandtab tabstop=2 shiftwidth=2: | 945 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |