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

Side by Side Diff: build/common.gypi

Issue 61893020: Set TargetMachine for libs too (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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 2542 matching lines...) Expand 10 before | Expand all | Expand 10 after
2553 ], 2553 ],
2554 }, 2554 },
2555 }, 2555 },
2556 }, 2556 },
2557 'x86_Base': { 2557 'x86_Base': {
2558 'abstract': 1, 2558 'abstract': 1,
2559 'msvs_settings': { 2559 'msvs_settings': {
2560 'VCLinkerTool': { 2560 'VCLinkerTool': {
2561 'TargetMachine': '1', 2561 'TargetMachine': '1',
2562 }, 2562 },
2563 'VCLibrarianTool': {
2564 'TargetMachine': '1',
2565 },
2563 }, 2566 },
2564 'msvs_configuration_platform': 'Win32', 2567 'msvs_configuration_platform': 'Win32',
2565 }, 2568 },
2566 'x64_Base': { 2569 'x64_Base': {
2567 'abstract': 1, 2570 'abstract': 1,
2568 'msvs_configuration_platform': 'x64', 2571 'msvs_configuration_platform': 'x64',
2569 'msvs_settings': { 2572 'msvs_settings': {
2570 'VCLinkerTool': { 2573 'VCLinkerTool': {
2571 'TargetMachine': '17', # x86 - 64 2574 'TargetMachine': '17', # x86 - 64
2572 'AdditionalLibraryDirectories!': 2575 'AdditionalLibraryDirectories!':
2573 ['<(windows_sdk_path)/Lib/win8/um/x86'], 2576 ['<(windows_sdk_path)/Lib/win8/um/x86'],
2574 'AdditionalLibraryDirectories': 2577 'AdditionalLibraryDirectories':
2575 ['<(windows_sdk_path)/Lib/win8/um/x64'], 2578 ['<(windows_sdk_path)/Lib/win8/um/x64'],
2576 # Doesn't exist x64 SDK. Should use oleaut32 in any case. 2579 # Doesn't exist x64 SDK. Should use oleaut32 in any case.
2577 'IgnoreDefaultLibraryNames': [ 'olepro32.lib' ], 2580 'IgnoreDefaultLibraryNames': [ 'olepro32.lib' ],
2578 }, 2581 },
2579 'VCLibrarianTool': { 2582 'VCLibrarianTool': {
2580 'AdditionalLibraryDirectories!': 2583 'AdditionalLibraryDirectories!':
2581 ['<(windows_sdk_path)/Lib/win8/um/x86'], 2584 ['<(windows_sdk_path)/Lib/win8/um/x86'],
2582 'AdditionalLibraryDirectories': 2585 'AdditionalLibraryDirectories':
2583 ['<(windows_sdk_path)/Lib/win8/um/x64'], 2586 ['<(windows_sdk_path)/Lib/win8/um/x64'],
2587 'TargetMachine': '17', # x64
2584 }, 2588 },
2585 }, 2589 },
2586 }, 2590 },
2587 'Debug_Base': { 2591 'Debug_Base': {
2588 'abstract': 1, 2592 'abstract': 1,
2589 'defines': [ 2593 'defines': [
2590 'DYNAMIC_ANNOTATIONS_ENABLED=1', 2594 'DYNAMIC_ANNOTATIONS_ENABLED=1',
2591 'WTF_USE_DYNAMIC_ANNOTATIONS=1', 2595 'WTF_USE_DYNAMIC_ANNOTATIONS=1',
2592 ], 2596 ],
2593 'xcode_settings': { 2597 'xcode_settings': {
(...skipping 2108 matching lines...) Expand 10 before | Expand all | Expand 10 after
4702 # settings in target dicts. SYMROOT is a special case, because many other 4706 # settings in target dicts. SYMROOT is a special case, because many other
4703 # Xcode variables depend on it, including variables such as 4707 # Xcode variables depend on it, including variables such as
4704 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4708 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4705 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4709 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4706 # files to appear (when present) in the UI as actual files and not red 4710 # files to appear (when present) in the UI as actual files and not red
4707 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4711 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4708 # and therefore SYMROOT, needs to be set at the project level. 4712 # and therefore SYMROOT, needs to be set at the project level.
4709 'SYMROOT': '<(DEPTH)/xcodebuild', 4713 'SYMROOT': '<(DEPTH)/xcodebuild',
4710 }, 4714 },
4711 } 4715 }
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