| 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 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 'Release': { | 267 'Release': { |
| 268 'defines': [ | 268 'defines': [ |
| 269 'NDEBUG', | 269 'NDEBUG', |
| 270 ], | 270 ], |
| 271 'xcode_settings': { | 271 'xcode_settings': { |
| 272 'DEAD_CODE_STRIPPING': 'YES', # -Wl,-dead_strip | 272 'DEAD_CODE_STRIPPING': 'YES', # -Wl,-dead_strip |
| 273 'GCC_OPTIMIZATION_LEVEL': '<(mac_release_optimization)', | 273 'GCC_OPTIMIZATION_LEVEL': '<(mac_release_optimization)', |
| 274 }, | 274 }, |
| 275 'conditions': [ | 275 'conditions': [ |
| 276 [ 'OS=="win" and msvs_use_common_release', { | 276 [ 'OS=="win" and msvs_use_common_release', { |
| 277 'configuration_platform': 'Win32', | |
| 278 'msvs_props': ['release.vsprops'], | 277 'msvs_props': ['release.vsprops'], |
| 279 }], | 278 }], |
| 280 [ 'OS=="win"', { | 279 [ 'OS=="win"', { |
| 280 'configuration_platform': 'Win32', |
| 281 'msvs_configuration_attributes': { | 281 'msvs_configuration_attributes': { |
| 282 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)', | 282 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)', |
| 283 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', | 283 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', |
| 284 'CharacterSet': '1', | 284 'CharacterSet': '1', |
| 285 }, | 285 }, |
| 286 'msvs_settings': { | 286 'msvs_settings': { |
| 287 'VCLinkerTool': { | 287 'VCLinkerTool': { |
| 288 'LinkIncremental': '1', | 288 'LinkIncremental': '1', |
| 289 }, | 289 }, |
| 290 }, | 290 }, |
| 291 }], | 291 }], |
| 292 ], | 292 ], |
| 293 }, | 293 }, |
| 294 'conditions': [ | 294 'conditions': [ |
| 295 [ 'OS=="win"', { | 295 [ 'OS=="win"', { |
| 296 # TODO(bradnelson): add a gyp mechanism to make this more graceful. | 296 # TODO(bradnelson): add a gyp mechanism to make this more graceful. |
| 297 'Purify': { | 297 'Purify': { |
| 298 'configuration_platform': 'Win32', |
| 298 'defines': [ | 299 'defines': [ |
| 299 'NDEBUG', | 300 'NDEBUG', |
| 300 'PURIFY', | 301 'PURIFY', |
| 301 'NO_TCMALLOC', | 302 'NO_TCMALLOC', |
| 302 ], | 303 ], |
| 303 'msvs_configuration_attributes': { | 304 'msvs_configuration_attributes': { |
| 304 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)', | 305 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)', |
| 305 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', | 306 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', |
| 306 'CharacterSet': '1', | 307 'CharacterSet': '1', |
| 307 }, | 308 }, |
| 308 'msvs_settings': { | 309 'msvs_settings': { |
| 309 'VCCLCompilerTool': { | 310 'VCCLCompilerTool': { |
| 310 'Optimization': '0', | 311 'Optimization': '0', |
| 311 'RuntimeLibrary': '0', | 312 'RuntimeLibrary': '0', |
| 312 'BufferSecurityCheck': 'false', | 313 'BufferSecurityCheck': 'false', |
| 313 }, | 314 }, |
| 314 'VCLinkerTool': { | 315 'VCLinkerTool': { |
| 315 'EnableCOMDATFolding': '1', | 316 'EnableCOMDATFolding': '1', |
| 316 'LinkIncremental': '1', | 317 'LinkIncremental': '1', |
| 317 }, | 318 }, |
| 318 }, | 319 }, |
| 319 'conditions': [ | 320 'conditions': [ |
| 320 [ 'msvs_use_common_release', { | 321 [ 'msvs_use_common_release', { |
| 321 'configuration_platform': 'Win32', | |
| 322 'msvs_props': ['release.vsprops'], | 322 'msvs_props': ['release.vsprops'], |
| 323 }], | 323 }], |
| 324 ], | 324 ], |
| 325 }, | 325 }, |
| 326 'Release - no tcmalloc': { | 326 'Release - no tcmalloc': { |
| 327 'configuration_platform': 'Win32', |
| 327 'defines': [ | 328 'defines': [ |
| 328 'NDEBUG', | 329 'NDEBUG', |
| 329 'NO_TCMALLOC', | 330 'NO_TCMALLOC', |
| 330 ], | 331 ], |
| 331 'msvs_configuration_attributes': { | 332 'msvs_configuration_attributes': { |
| 332 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)', | 333 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)', |
| 333 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', | 334 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', |
| 334 'CharacterSet': '1', | 335 'CharacterSet': '1', |
| 335 }, | 336 }, |
| 336 'conditions': [ | 337 'conditions': [ |
| 337 [ 'msvs_use_common_release', { | 338 [ 'msvs_use_common_release', { |
| 338 'configuration_platform': 'Win32', | |
| 339 'msvs_props': ['release.vsprops'], | 339 'msvs_props': ['release.vsprops'], |
| 340 }], | 340 }], |
| 341 ], | 341 ], |
| 342 'msvs_settings': { | 342 'msvs_settings': { |
| 343 'VCLinkerTool': { | 343 'VCLinkerTool': { |
| 344 'LinkIncremental': '1', | 344 'LinkIncremental': '1', |
| 345 }, | 345 }, |
| 346 }, | 346 }, |
| 347 }, | 347 }, |
| 348 }], | 348 }], |
| (...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 770 # settings in target dicts. SYMROOT is a special case, because many other | 770 # settings in target dicts. SYMROOT is a special case, because many other |
| 771 # Xcode variables depend on it, including variables such as | 771 # Xcode variables depend on it, including variables such as |
| 772 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 772 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 773 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 773 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 774 # files to appear (when present) in the UI as actual files and not red | 774 # files to appear (when present) in the UI as actual files and not red |
| 775 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 775 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 776 # and therefore SYMROOT, needs to be set at the project level. | 776 # and therefore SYMROOT, needs to be set at the project level. |
| 777 'SYMROOT': '<(DEPTH)/xcodebuild', | 777 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 778 }, | 778 }, |
| 779 } | 779 } |
| OLD | NEW |