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

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: Don't force SDK 7.1 by default. 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 823 matching lines...) Expand 10 before | Expand all | Expand 10 after
834 },{ 834 },{
835 'msvs_express%': 0, 835 'msvs_express%': 0,
836 'secure_atl%': 1, 836 'secure_atl%': 1,
837 }], 837 }],
838 ], 838 ],
839 'nacl_win64_defines': [ 839 'nacl_win64_defines': [
840 # This flag is used to minimize dependencies when building 840 # This flag is used to minimize dependencies when building
841 # Native Client loader for 64-bit Windows. 841 # Native Client loader for 64-bit Windows.
842 'NACL_WIN64', 842 'NACL_WIN64',
843 ], 843 ],
844
845 # The desired version of Windows SDK (if different from one used by
846 # default) should be specified in common.gypi.
Nico 2012/02/27 18:09:07 s/common.gypi/include.gypi/, right?
alexeypa (please no reviews) 2012/02/28 21:03:08 Yes, indeed.
847 'msbuild_toolset%': '',
844 }], 848 }],
845 849
846 ['os_posix==1 and chromeos==0 and target_arch!="arm"', { 850 ['os_posix==1 and chromeos==0 and target_arch!="arm"', {
847 'use_cups%': 1, 851 'use_cups%': 1,
848 }, { 852 }, {
849 'use_cups%': 0, 853 'use_cups%': 0,
850 }], 854 }],
851 855
852 # Set the relative path from this file to the GYP file of the JPEG 856 # Set the relative path from this file to the GYP file of the JPEG
853 # library used by Chromium. 857 # library used by Chromium.
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
1026 'win_release_RuntimeLibrary%': '2', # 2 = /MT (nondebug DLL) 1030 'win_release_RuntimeLibrary%': '2', # 2 = /MT (nondebug DLL)
1027 'win_debug_RuntimeLibrary%': '3', # 3 = /MTd (debug DLL) 1031 'win_debug_RuntimeLibrary%': '3', # 3 = /MTd (debug DLL)
1028 }, { 1032 }, {
1029 # See http://msdn.microsoft.com/en-us/library/aa652367.aspx 1033 # See http://msdn.microsoft.com/en-us/library/aa652367.aspx
1030 'win_release_RuntimeLibrary%': '0', # 0 = /MT (nondebug static) 1034 'win_release_RuntimeLibrary%': '0', # 0 = /MT (nondebug static)
1031 'win_debug_RuntimeLibrary%': '1', # 1 = /MTd (debug static) 1035 'win_debug_RuntimeLibrary%': '1', # 1 = /MTd (debug static)
1032 }], 1036 }],
1033 ], 1037 ],
1034 }, 1038 },
1035 'conditions': [ 1039 'conditions': [
1040 ['OS=="win" and "<(msbuild_toolset)"!=""', {
1041 'msbuild_toolset': '<(msbuild_toolset)',
1042 }],
1036 ['branding=="Chrome"', { 1043 ['branding=="Chrome"', {
1037 'defines': ['GOOGLE_CHROME_BUILD'], 1044 'defines': ['GOOGLE_CHROME_BUILD'],
1038 }, { # else: branding!="Chrome" 1045 }, { # else: branding!="Chrome"
1039 'defines': ['CHROMIUM_BUILD'], 1046 'defines': ['CHROMIUM_BUILD'],
1040 }], 1047 }],
1041 ['component=="shared_library"', { 1048 ['component=="shared_library"', {
1042 'defines': ['COMPONENT_BUILD'], 1049 'defines': ['COMPONENT_BUILD'],
1043 }], 1050 }],
1044 ['component=="shared_library" and incremental_chrome_dll==1', { 1051 ['component=="shared_library" and incremental_chrome_dll==1', {
1045 # TODO(dpranke): We can't incrementally link chrome when 1052 # TODO(dpranke): We can't incrementally link chrome when
(...skipping 1750 matching lines...) Expand 10 before | Expand all | Expand 10 after
2796 # settings in target dicts. SYMROOT is a special case, because many other 2803 # settings in target dicts. SYMROOT is a special case, because many other
2797 # Xcode variables depend on it, including variables such as 2804 # Xcode variables depend on it, including variables such as
2798 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2805 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2799 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2806 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2800 # files to appear (when present) in the UI as actual files and not red 2807 # files to appear (when present) in the UI as actual files and not red
2801 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2808 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2802 # and therefore SYMROOT, needs to be set at the project level. 2809 # and therefore SYMROOT, needs to be set at the project level.
2803 'SYMROOT': '<(DEPTH)/xcodebuild', 2810 'SYMROOT': '<(DEPTH)/xcodebuild',
2804 }, 2811 },
2805 } 2812 }
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