diff options
| author | borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-01 17:43:44 +0000 |
|---|---|---|
| committer | borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-01 17:43:44 +0000 |
| commit | a50f02d8ef2af6cab080cada57e2bdd28ba67fd5 (patch) | |
| tree | 71aa1fd43a1221edc5db49a71a50b0127bc8ad21 /common.gypi | |
| parent | 545df1300b9a586b79b992c9d718c8b9d6de346d (diff) | |
| download | gyp-a50f02d8ef2af6cab080cada57e2bdd28ba67fd5.tar.gz | |
Improve NaCl support
- Add nacl_make script to build Skia targets for NaCl using gyp
- Add nacl_interface for command-line apps
- Add nacl_sample as front-end for SampleApp
- Add freetype to DEPS
- Various gyp tweaks for NaCl
TODO:
- Implement GL interface
- Implement font host
- Fix plumbing so that SampleApp works properly
Review URL: https://codereview.appspot.com/6671044
git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@6245 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'common.gypi')
| -rw-r--r-- | common.gypi | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/common.gypi b/common.gypi index b620226..7dc27da 100644 --- a/common.gypi +++ b/common.gypi @@ -21,15 +21,21 @@ # situations, like building for iOS on a Mac. 'variables': { 'conditions': [ - ['skia_os != OS and not (skia_os == "ios" and OS == "mac")', - {'error': '<!(Cannot build with skia_os=<(skia_os) on OS=<(OS))'}], - ['skia_mesa and skia_os not in ["mac", "linux"]', - {'error': '<!(skia_mesa=1 only supported with skia_os="mac" or "linux".)'}], - ['skia_angle and not skia_os == "win"', - {'error': '<!(skia_angle=1 only supported with skia_os="win".)' + [ 'skia_os != OS and not ((skia_os == "ios" and OS == "mac") or \ + (skia_os == "nacl" and OS == "linux"))', { + 'error': '<!(Cannot build with skia_os=<(skia_os) on OS=<(OS))', }], - ['skia_arch_width != 32 and skia_arch_width != 64', - {'error': '<!(skia_arch_width can only be 32 or 64 bits not <(skia_arch_width) bits)' + [ 'skia_mesa and skia_os not in ["mac", "linux"]', { + 'error': '<!(skia_mesa=1 only supported with skia_os="mac" or "linux".)', + }], + [ 'skia_angle and not skia_os == "win"', { + 'error': '<!(skia_angle=1 only supported with skia_os="win".)', + }], + [ 'skia_arch_width != 32 and skia_arch_width != 64', { + 'error': '<!(skia_arch_width can only be 32 or 64 bits not <(skia_arch_width) bits)', + }], + [ 'skia_os == "nacl" and OS != "linux"', { + 'error': '<!(Skia NaCl build only currently supported on Linux.)', }], ], }, |