diff options
| author |  bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-16 16:13:40 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-16 16:13:40 +0000 |
| commit | e8f0592ae8b37e94d99f49816eb22e9fafde6d86 (patch) | |
| tree | bab72f66f6918bdacd66e14163dce1215a5f26ba /gyp | |
| parent | 0557d9ea94d5435a9072c9b4141a05190d648442 (diff) | |
DirectWrite font host for skia.
https://codereview.appspot.com/5417063/
git-svn-id: http://skia.googlecode.com/svn/trunk@5128 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common.gypi | 5 | ||||
| -rw-r--r-- | gyp/common_variables.gypi | 4 | ||||
| -rw-r--r-- | gyp/ports.gyp | 13 | ||||
| -rw-r--r-- | gyp/utils.gyp | 15 |
4 files changed, 34 insertions, 3 deletions
diff --git a/gyp/common.gypi b/gyp/common.gypi index 4b558f893e..08c266e5dc 100644 --- a/gyp/common.gypi +++ b/gyp/common.gypi @@ -50,6 +50,11 @@ ], } ], + [ 'skia_directwrite', { + 'defines': [ + 'SK_FONTHOST_WIN_DW', + ], + }], [ 'skia_mesa', { 'defines': [ 'SK_MESA', diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index fd2c7e74f7..247fe746c0 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -70,6 +70,7 @@ # Do not turn on 'skia_angle' - it is currently experimental 'skia_angle%': 0, 'skia_arch_type%': 'x86', + 'skia_directwrite%': 0, 'android_make_apk%': 1, 'skia_gpu%': 1, 'skia_static_initializers%': 1, @@ -85,6 +86,7 @@ 'skia_angle%': '<(skia_angle)', 'skia_arch_type%': '<(skia_arch_type)', 'skia_arch_width%': '<(skia_arch_width)', + 'skia_directwrite%': '<(skia_directwrite)', 'android_make_apk%': '<(android_make_apk)', 'skia_gpu%': '<(skia_gpu)', 'skia_static_initializers%': '<(skia_static_initializers)', @@ -99,4 +101,4 @@ # tab-width:2 # indent-tabs-mode:nil # End: -# vim: set expandtab tabstop=2 shiftwidth=2: +# vim: set expandtab tabstop=2 shiftwidth=2:
\ No newline at end of file diff --git a/gyp/ports.gyp b/gyp/ports.gyp index 3272ac9ba2..bb55030e0f 100644 --- a/gyp/ports.gyp +++ b/gyp/ports.gyp @@ -24,6 +24,7 @@ '../src/ports/SkFontDescriptor.cpp', '../src/ports/SkFontHost_sandbox_none.cpp', '../src/ports/SkFontHost_win.cpp', + '../src/ports/SkFontHost_win_dw.cpp', '../src/ports/SkGlobalInitialization_default.cpp', '../src/ports/SkThread_win.cpp', @@ -70,6 +71,18 @@ [ 'skia_os == "win"', { 'include_dirs': [ 'config/win', + '../src/utils/win', + ], + 'conditions': [ + [ 'skia_directwrite', { + 'sources!': [ + '../src/ports/SkFontHost_win.cpp', + ], + }, { # else !skia_directwrite + 'sources!': [ + '../src/ports/SkFontHost_win_dw.cpp', + ], + }], ], 'sources!': [ # these are used everywhere but windows '../src/ports/SkDebug_stdio.cpp', diff --git a/gyp/utils.gyp b/gyp/utils.gyp index 8b919a31d0..b4b8785465 100644 --- a/gyp/utils.gyp +++ b/gyp/utils.gyp @@ -2,10 +2,11 @@ 'targets': [ { 'target_name': 'utils', + 'dependencies': [ + 'core.gyp:core', + ], 'type': 'static_library', 'include_dirs': [ - '../include/config', - '../include/core', '../include/effects', '../include/pipe', '../include/utils', @@ -13,6 +14,7 @@ '../include/utils/unix', '../include/utils/win', '../include/xml', + '../src/utils', ], 'sources': [ '../include/utils/SkBoundaryPatch.h', @@ -45,6 +47,7 @@ '../src/utils/SkCullPoints.cpp', '../src/utils/SkDeferredCanvas.cpp', '../src/utils/SkDumpCanvas.cpp', + '../src/utils/SkFloatUtils.h', '../src/utils/SkInterpolator.cpp', '../src/utils/SkLayer.cpp', '../src/utils/SkMatrix44.cpp', @@ -77,6 +80,10 @@ '../include/utils/win/SkIStream.h', '../include/utils/win/SkTScopedComPtr.h', '../src/utils/win/SkAutoCoInitialize.cpp', + '../src/utils/win/SkDWriteFontFileStream.cpp', + '../src/utils/win/SkDWriteFontFileStream.h', + '../src/utils/win/SkDWriteGeometrySink.cpp', + '../src/utils/win/SkDWriteGeometrySink.h', '../src/utils/win/SkHRESULT.cpp', '../src/utils/win/SkIStream.cpp', '../src/utils/win/SkWGL_win.cpp', @@ -149,6 +156,10 @@ '../include/utils/win/SkIStream.h', '../include/utils/win/SkTScopedComPtr.h', '../src/utils/win/SkAutoCoInitialize.cpp', + '../src/utils/win/SkDWriteFontFileStream.cpp', + '../src/utils/win/SkDWriteFontFileStream.h', + '../src/utils/win/SkDWriteGeometrySink.cpp', + '../src/utils/win/SkDWriteGeometrySink.h', '../src/utils/win/SkHRESULT.cpp', '../src/utils/win/SkIStream.cpp', ], |