Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(330)

Side by Side Diff: build/common.gypi

Issue 12300024: Change intermediate and output directories for 64bit VS build to different from x86 build. This su… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@allocator
Patch Set: shorten line lengths a bit Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 2170 matching lines...) Expand 10 before | Expand all | Expand 10 after
2181 'abstract': 1, 2181 'abstract': 1,
2182 'msvs_settings': { 2182 'msvs_settings': {
2183 'VCLinkerTool': { 2183 'VCLinkerTool': {
2184 'TargetMachine': '1', 2184 'TargetMachine': '1',
2185 }, 2185 },
2186 }, 2186 },
2187 'msvs_configuration_platform': 'Win32', 2187 'msvs_configuration_platform': 'Win32',
2188 }, 2188 },
2189 'x64_Base': { 2189 'x64_Base': {
2190 'abstract': 1, 2190 'abstract': 1,
2191 'msvs_configuration_attributes': {
2192 'OutputDirectory':
2193 '<(DEPTH)\\build\\<(build_dir_prefix)$(ConfigurationName)_x64',
2194 },
2191 'msvs_configuration_platform': 'x64', 2195 'msvs_configuration_platform': 'x64',
2192 'msvs_settings': { 2196 'msvs_settings': {
2193 'VCLinkerTool': { 2197 'VCLinkerTool': {
2194 'TargetMachine': '17', # x86 - 64 2198 'TargetMachine': '17', # x86 - 64
2195 'AdditionalLibraryDirectories!': 2199 'AdditionalLibraryDirectories!':
2196 ['<(windows_sdk_path)/Lib/win8/um/x86'], 2200 ['<(windows_sdk_path)/Lib/win8/um/x86'],
2197 'AdditionalLibraryDirectories': 2201 'AdditionalLibraryDirectories':
2198 ['<(windows_sdk_path)/Lib/win8/um/x64'], 2202 ['<(windows_sdk_path)/Lib/win8/um/x64'],
2199 }, 2203 },
2200 'VCLibrarianTool': { 2204 'VCLibrarianTool': {
(...skipping 1850 matching lines...) Expand 10 before | Expand all | Expand 10 after
4051 # settings in target dicts. SYMROOT is a special case, because many other 4055 # settings in target dicts. SYMROOT is a special case, because many other
4052 # Xcode variables depend on it, including variables such as 4056 # Xcode variables depend on it, including variables such as
4053 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4057 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4054 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4058 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4055 # files to appear (when present) in the UI as actual files and not red 4059 # files to appear (when present) in the UI as actual files and not red
4056 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4060 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4057 # and therefore SYMROOT, needs to be set at the project level. 4061 # and therefore SYMROOT, needs to be set at the project level.
4058 'SYMROOT': '<(DEPTH)/xcodebuild', 4062 'SYMROOT': '<(DEPTH)/xcodebuild',
4059 }, 4063 },
4060 } 4064 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698