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

Side by Side Diff: build/common.gypi

Issue 9447062: Using Windows SDK v7.1 when building in MSBuild (Visual Studio 2010/2010e). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 8 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 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
681 'java_bridge%': 0, 681 'java_bridge%': 0,
682 682
683 # This flag is only used when disable_nacl==0 and disables all those 683 # This flag is only used when disable_nacl==0 and disables all those
684 # subcomponents which would require the installation of a native_client 684 # subcomponents which would require the installation of a native_client
685 # untrusted toolchain. 685 # untrusted toolchain.
686 'disable_nacl_untrusted%': 0, 686 'disable_nacl_untrusted%': 0,
687 687
688 # Disable Dart by default. 688 # Disable Dart by default.
689 'enable_dart%': 0, 689 'enable_dart%': 0,
690 690
691 # The desired version of Windows SDK can be set in ~/.gyp/include.gypi.
692 'msbuild_toolset%': '',
693
691 'conditions': [ 694 'conditions': [
692 # Used to disable Native Client at compile time, for platforms where it 695 # Used to disable Native Client at compile time, for platforms where it
693 # isn't supported (ARM) 696 # isn't supported (ARM)
694 ['target_arch=="arm" and chromeos == 1', { 697 ['target_arch=="arm" and chromeos == 1', {
695 'disable_nacl%': 1, 698 'disable_nacl%': 1,
696 }, { 699 }, {
697 'disable_nacl%': 0, 700 'disable_nacl%': 0,
698 }], 701 }],
699 ['os_posix==1 and OS!="mac" and OS!="android"', { 702 ['os_posix==1 and OS!="mac" and OS!="android"', {
700 # This will set gcc_version to XY if you are running gcc X.Y.*. 703 # This will set gcc_version to XY if you are running gcc X.Y.*.
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
1032 'win_release_RuntimeLibrary%': '2', # 2 = /MT (nondebug DLL) 1035 'win_release_RuntimeLibrary%': '2', # 2 = /MT (nondebug DLL)
1033 'win_debug_RuntimeLibrary%': '3', # 3 = /MTd (debug DLL) 1036 'win_debug_RuntimeLibrary%': '3', # 3 = /MTd (debug DLL)
1034 }, { 1037 }, {
1035 # See http://msdn.microsoft.com/en-us/library/aa652367.aspx 1038 # See http://msdn.microsoft.com/en-us/library/aa652367.aspx
1036 'win_release_RuntimeLibrary%': '0', # 0 = /MT (nondebug static) 1039 'win_release_RuntimeLibrary%': '0', # 0 = /MT (nondebug static)
1037 'win_debug_RuntimeLibrary%': '1', # 1 = /MTd (debug static) 1040 'win_debug_RuntimeLibrary%': '1', # 1 = /MTd (debug static)
1038 }], 1041 }],
1039 ], 1042 ],
1040 }, 1043 },
1041 'conditions': [ 1044 'conditions': [
1045 ['OS=="win" and "<(msbuild_toolset)"!=""', {
1046 'msbuild_toolset': '<(msbuild_toolset)',
1047 }],
1042 ['branding=="Chrome"', { 1048 ['branding=="Chrome"', {
1043 'defines': ['GOOGLE_CHROME_BUILD'], 1049 'defines': ['GOOGLE_CHROME_BUILD'],
1044 }, { # else: branding!="Chrome" 1050 }, { # else: branding!="Chrome"
1045 'defines': ['CHROMIUM_BUILD'], 1051 'defines': ['CHROMIUM_BUILD'],
1046 }], 1052 }],
1047 ['component=="shared_library"', { 1053 ['component=="shared_library"', {
1048 'defines': ['COMPONENT_BUILD'], 1054 'defines': ['COMPONENT_BUILD'],
1049 }], 1055 }],
1050 ['component=="shared_library" and incremental_chrome_dll==1', { 1056 ['component=="shared_library" and incremental_chrome_dll==1', {
1051 # TODO(dpranke): We can't incrementally link chrome when 1057 # TODO(dpranke): We can't incrementally link chrome when
(...skipping 1756 matching lines...) Expand 10 before | Expand all | Expand 10 after
2808 # settings in target dicts. SYMROOT is a special case, because many other 2814 # settings in target dicts. SYMROOT is a special case, because many other
2809 # Xcode variables depend on it, including variables such as 2815 # Xcode variables depend on it, including variables such as
2810 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2816 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2811 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2817 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2812 # files to appear (when present) in the UI as actual files and not red 2818 # files to appear (when present) in the UI as actual files and not red
2813 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2819 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2814 # and therefore SYMROOT, needs to be set at the project level. 2820 # and therefore SYMROOT, needs to be set at the project level.
2815 'SYMROOT': '<(DEPTH)/xcodebuild', 2821 'SYMROOT': '<(DEPTH)/xcodebuild',
2816 }, 2822 },
2817 } 2823 }
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