diff options
| author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-29 22:53:30 +0000 |
|---|---|---|
| committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-29 22:53:30 +0000 |
| commit | ff10b13ea905ed7f9813f62ab95fa7fef3cc7390 (patch) | |
| tree | 8046721fa0db470791d5182cd8cd5e4e00323a88 /build | |
| parent | e8be39817f8f26de23e85524b52a255ccfe77ac8 (diff) | |
| download | chromium_src-ff10b13ea905ed7f9813f62ab95fa7fef3cc7390.zip chromium_src-ff10b13ea905ed7f9813f62ab95fa7fef3cc7390.tar.gz chromium_src-ff10b13ea905ed7f9813f62ab95fa7fef3cc7390.tar.bz2 | |
The 'msbuild_toolset%' variable can be used to select the desired version of Windows SDK when building in MSBuild (Visual Studio 2010/2010e).
TEST=Built all.sln successfully.
Review URL: http://codereview.chromium.org/9447062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124274 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index 821adc9..f5bc3a5 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" |