diff options
| author | bungeman <bungeman@google.com> | 2015-08-19 11:56:48 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-19 11:56:48 -0700 |
| commit | f3c15b7cfc4eed2528f7db87ea6c1444b55ee856 (patch) | |
| tree | 00516f1f5ecd2b72ef8d8cd6643055a5d9db8f2c /gyp | |
| parent | 9be0b002caaf4f44e04873351f957c3e97922457 (diff) | |
| download | skia-f3c15b7cfc4eed2528f7db87ea6c1444b55ee856.tar.gz | |
Move SkTemplates.h to private.
SkTemplates.h contains a number of Skia specific utilities which are
not designed for external use. In addition to reducing the external
support burden, this will allow Skia to freely refactor this file.
Review URL: https://codereview.chromium.org/1272293004
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/core.gypi | 2 | ||||
| -rw-r--r-- | gyp/sfnt.gyp | 1 | ||||
| -rw-r--r-- | gyp/tools.gyp | 10 |
3 files changed, 12 insertions, 1 deletions
diff --git a/gyp/core.gypi b/gyp/core.gypi index dd0ce0484a..c35592e6c5 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -329,7 +329,6 @@ '<(skia_include_path)/core/SkTInternalLList.h', '<(skia_include_path)/core/SkTRegistry.h', '<(skia_include_path)/core/SkTSearch.h', - '<(skia_include_path)/core/SkTemplates.h', '<(skia_include_path)/core/SkTextBlob.h', '<(skia_include_path)/core/SkTime.h', '<(skia_include_path)/core/SkTLazy.h', @@ -339,6 +338,7 @@ '<(skia_include_path)/core/SkUtils.h', '<(skia_include_path)/core/SkWriter32.h', '<(skia_include_path)/core/SkXfermode.h', + '<(skia_include_path)/private/SkTemplates.h', # Lazy decoding: '<(skia_src_path)/lazy/SkCachingPixelRef.cpp', diff --git a/gyp/sfnt.gyp b/gyp/sfnt.gyp index c129570e6b..7ff635b280 100644 --- a/gyp/sfnt.gyp +++ b/gyp/sfnt.gyp @@ -13,6 +13,7 @@ 'core.gyp:*', ], 'include_dirs': [ + '../include/private', '../src/core', '../src/sfnt', ], diff --git a/gyp/tools.gyp b/gyp/tools.gyp index 2f250376f9..d7b2e131e7 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -164,6 +164,16 @@ 'dependencies': [ 'skia_lib.gyp:skia_lib', ], + 'xcode_settings': { + 'conditions': [ + [ 'skia_osx_deployment_target==""', { + 'MACOSX_DEPLOYMENT_TARGET': '10.7', # -mmacos-version-min, passed in env to ld. + }, { + 'MACOSX_DEPLOYMENT_TARGET': '<(skia_osx_deployment_target)', + }], + ], + 'CLANG_CXX_LIBRARY': 'libc++', + }, }, { 'target_name': 'skpdiff', |