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 | 7158e6acca1b1ecc321d4d514a31cba11b5ead60 (patch) | |
| tree | a7a1a00365caf900fa940e586fc41e10261c23ff /gm | |
| parent | 671eac67ef5f44b80f882e06cf17f1b8f6802980 (diff) | |
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@6245 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/gmmain.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp index 54bbd8b9eb..a4c88b1b6b 100644 --- a/gm/gmmain.cpp +++ b/gm/gmmain.cpp @@ -1301,7 +1301,7 @@ int tool_main(int argc, char** argv) { return (0 == testsFailed) ? 0 : -1; } -#if !defined SK_BUILD_FOR_IOS +#if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) int main(int argc, char * const argv[]) { return tool_main(argc, (char**) argv); } |