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

Unified 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, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 821adc9da32b4c009491ae56536b727f79300d65..f5bc3a56f619937f2cd4aa2ea1a751e896d70713 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -688,6 +688,9 @@
# Disable Dart by default.
'enable_dart%': 0,
+ # The desired version of Windows SDK can be set in ~/.gyp/include.gypi.
+ 'msbuild_toolset%': '',
+
'conditions': [
# Used to disable Native Client at compile time, for platforms where it
# isn't supported (ARM)
@@ -1039,6 +1042,9 @@
],
},
'conditions': [
+ ['OS=="win" and "<(msbuild_toolset)"!=""', {
+ 'msbuild_toolset': '<(msbuild_toolset)',
+ }],
['branding=="Chrome"', {
'defines': ['GOOGLE_CHROME_BUILD'],
}, { # else: branding!="Chrome"
« 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