diff options
| author |  epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-01 07:02:41 +0000 |
|---|---|---|
| committer | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-01 07:02:41 +0000 |
| commit | 58d69d846071ff9a84e879041f2f092006bfcd14 (patch) | |
| tree | ff89f73f603bed7b242ee260f09aba19f563d0b7 /gyp | |
| parent | 2c48ee83c824964fbcb3dc4733055da0e75e154f (diff) | |
change default build (in "make" wrapper) to ninja on all platforms
force-landed from https://codereview.chromium.org/206463007/ ;
the CommitQueue couldn't handle the diff properly for some reason
git-svn-id: http://skia.googlecode.com/svn/trunk@14003 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_conditions.gypi | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 82f63f375b..70effa1723 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -85,6 +85,22 @@ }, }, }, + # Gyp's ninja generator depends on these specially named + # configurations to build 64-bit on Windows. + # See http://skbug.com/2348 + # + # We handle the 64- vs 32-bit variations elsewhere, so I think it's + # OK for us to just make these inherit non-archwidth-specific + # configurations without modification. + 'Debug_x64': { + 'inherit_from': ['Debug'], + }, + 'Release_x64': { + 'inherit_from': ['Release'], + }, + 'Release_Developer_x64': { + 'inherit_from': ['Release_Developer'], + }, }, 'conditions' : [ [ 'skia_arch_width == 64', { |