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

Side by Side Diff: build/common.gypi

Issue 12377089: fix linking against olepro32.lib on win x64 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 | Annotate | Revision Log
« 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 2217 matching lines...) Expand 10 before | Expand all | Expand 10 after
2228 'x64_Base': { 2228 'x64_Base': {
2229 'abstract': 1, 2229 'abstract': 1,
2230 'msvs_configuration_platform': 'x64', 2230 'msvs_configuration_platform': 'x64',
2231 'msvs_settings': { 2231 'msvs_settings': {
2232 'VCLinkerTool': { 2232 'VCLinkerTool': {
2233 'TargetMachine': '17', # x86 - 64 2233 'TargetMachine': '17', # x86 - 64
2234 'AdditionalLibraryDirectories!': 2234 'AdditionalLibraryDirectories!':
2235 ['<(windows_sdk_path)/Lib/win8/um/x86'], 2235 ['<(windows_sdk_path)/Lib/win8/um/x86'],
2236 'AdditionalLibraryDirectories': 2236 'AdditionalLibraryDirectories':
2237 ['<(windows_sdk_path)/Lib/win8/um/x64'], 2237 ['<(windows_sdk_path)/Lib/win8/um/x64'],
2238 # Doesn't exist x64 SDK. Should use oleaut32 in any case.
2239 'IgnoreDefaultLibraryNames': [ 'olepro32.lib' ],
2238 }, 2240 },
2239 'VCLibrarianTool': { 2241 'VCLibrarianTool': {
2240 'AdditionalLibraryDirectories!': 2242 'AdditionalLibraryDirectories!':
2241 ['<(windows_sdk_path)/Lib/win8/um/x86'], 2243 ['<(windows_sdk_path)/Lib/win8/um/x86'],
2242 'AdditionalLibraryDirectories': 2244 'AdditionalLibraryDirectories':
2243 ['<(windows_sdk_path)/Lib/win8/um/x64'], 2245 ['<(windows_sdk_path)/Lib/win8/um/x64'],
2244 }, 2246 },
2245 }, 2247 },
2246 }, 2248 },
2247 'Debug_Base': { 2249 'Debug_Base': {
(...skipping 1877 matching lines...) Expand 10 before | Expand all | Expand 10 after
4125 # settings in target dicts. SYMROOT is a special case, because many other 4127 # settings in target dicts. SYMROOT is a special case, because many other
4126 # Xcode variables depend on it, including variables such as 4128 # Xcode variables depend on it, including variables such as
4127 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4129 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4128 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4130 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4129 # files to appear (when present) in the UI as actual files and not red 4131 # files to appear (when present) in the UI as actual files and not red
4130 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4132 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4131 # and therefore SYMROOT, needs to be set at the project level. 4133 # and therefore SYMROOT, needs to be set at the project level.
4132 'SYMROOT': '<(DEPTH)/xcodebuild', 4134 'SYMROOT': '<(DEPTH)/xcodebuild',
4133 }, 4135 },
4134 } 4136 }
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