diff options
| author | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-16 13:52:49 +0000 |
|---|---|---|
| committer | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-16 13:52:49 +0000 |
| commit | fc79bcf11ae67e538c55f5fb3239fcfea8b29115 (patch) | |
| tree | 53ac01224f8483681c433856369f2009ebc2e5ff /common.gypi | |
| parent | a629ce2e87d003f6812bda7dbe6078d595be9897 (diff) | |
| download | gyp-fc79bcf11ae67e538c55f5fb3239fcfea8b29115.tar.gz | |
Make all gyp targets automatically include common.gypi
Do this, rather than including common.gypi explicitly in all our gyp files, so that gyp files we use but do not maintain (e.g., third_party/externals/libjpeg/libjpeg.gyp) will include common.gypi too.
Review URL: https://codereview.appspot.com/5820068
git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3411 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'common.gypi')
| -rw-r--r-- | common.gypi | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/common.gypi b/common.gypi index 30424de..aa6e276 100644 --- a/common.gypi +++ b/common.gypi @@ -2,10 +2,22 @@ # # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +# +# This file is automatically included by gyp_skia when building any target. + { - 'includes': [ - 'common_variables.gypi', - ], + # Define all variables, allowing for override in GYP_DEFINES. + # + # One such variable is 'skia_os', which we use instead of 'OS' throughout + # our gyp files. We set it automatically based on 'OS', but allow the + # user to override it via GYP_DEFINES if they like. + 'variables': { + 'skia_scalar%': 'float', + 'skia_os%': '<(OS)', + 'skia_mesa%': 0, + 'skia_target_arch%': 'x86', + }, + 'target_defaults': { # Validate the 'skia_os' setting against 'OS', because only certain |