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