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

Side by Side Diff: build/common.gypi

Issue 22262003: Fix Win64 DirectX redistributables (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 4 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 | content/content_common.gypi » ('j') | 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 1396 matching lines...) Expand 10 before | Expand all | Expand 10 after
1407 }, { # else: branding!="Chrome" or buildtype!="Official" 1407 }, { # else: branding!="Chrome" or buildtype!="Official"
1408 'mac_sdk%': '<!(python <(DEPTH)/build/mac/find_sdk.py <(mac_sdk_min) )', 1408 'mac_sdk%': '<!(python <(DEPTH)/build/mac/find_sdk.py <(mac_sdk_min) )',
1409 'mac_breakpad_uploads%': 0, 1409 'mac_breakpad_uploads%': 0,
1410 'mac_breakpad%': 0, 1410 'mac_breakpad%': 0,
1411 'mac_keystone%': 0, 1411 'mac_keystone%': 0,
1412 }], 1412 }],
1413 ], 1413 ],
1414 }], # OS=="mac" or OS=="ios" 1414 }], # OS=="mac" or OS=="ios"
1415 ['OS=="win"', { 1415 ['OS=="win"', {
1416 'conditions': [ 1416 'conditions': [
1417 # This is the architecture convention used in WinSDK paths.
1418 ['target_arch=="ia32"', {
1419 'winsdk_arch%': 'x86',
1420 },{
1421 'winsdk_arch%': '<(target_arch)',
1422 }],
1417 ['component=="shared_library"', { 1423 ['component=="shared_library"', {
1418 'win_use_allocator_shim%': 0, 1424 'win_use_allocator_shim%': 0,
1419 }], 1425 }],
1420 ['component=="shared_library" and "<(GENERATOR)"=="ninja"', { 1426 ['component=="shared_library" and "<(GENERATOR)"=="ninja"', {
1421 # Only enabled by default for ninja because it's buggy in VS. 1427 # Only enabled by default for ninja because it's buggy in VS.
1422 # Not enabled for component=static_library because some targets 1428 # Not enabled for component=static_library because some targets
1423 # are too large and the toolchain fails due to the size of the 1429 # are too large and the toolchain fails due to the size of the
1424 # .obj files. 1430 # .obj files.
1425 'incremental_chrome_dll%': 1, 1431 'incremental_chrome_dll%': 1,
1426 }], 1432 }],
(...skipping 3254 matching lines...) Expand 10 before | Expand all | Expand 10 after
4681 # settings in target dicts. SYMROOT is a special case, because many other 4687 # settings in target dicts. SYMROOT is a special case, because many other
4682 # Xcode variables depend on it, including variables such as 4688 # Xcode variables depend on it, including variables such as
4683 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4689 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4684 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4690 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4685 # files to appear (when present) in the UI as actual files and not red 4691 # files to appear (when present) in the UI as actual files and not red
4686 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4692 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4687 # and therefore SYMROOT, needs to be set at the project level. 4693 # and therefore SYMROOT, needs to be set at the project level.
4688 'SYMROOT': '<(DEPTH)/xcodebuild', 4694 'SYMROOT': '<(DEPTH)/xcodebuild',
4689 }, 4695 },
4690 } 4696 }
OLDNEW
« no previous file with comments | « no previous file | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698