| Index: third_party/harfbuzz-ng/harfbuzz.gyp
|
| diff --git a/third_party/harfbuzz-ng/harfbuzz.gyp b/third_party/harfbuzz-ng/harfbuzz.gyp
|
| index c1ea3e485dd393feb654e871398de8e16a480457..ea8e48d2a5fa7575c40abc33869e5c028e1a149a 100644
|
| --- a/third_party/harfbuzz-ng/harfbuzz.gyp
|
| +++ b/third_party/harfbuzz-ng/harfbuzz.gyp
|
| @@ -1,4 +1,4 @@
|
| -# Copyright (c) 2009 The Chromium Authors. All rights reserved.
|
| +# Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| @@ -8,51 +8,79 @@
|
| ],
|
| 'targets': [
|
| {
|
| - 'target_name': 'harfbuzz',
|
| + 'target_name': 'harfbuzz-ng',
|
| 'type': 'static_library',
|
| + 'defines': [
|
| + 'HAVE_OT',
|
| + 'HAVE_ICU',
|
| + ],
|
| 'sources': [
|
| - 'src/hb-blob-private.h',
|
| - 'src/hb-blob.c',
|
| + 'src/hb-blob.cc',
|
| 'src/hb-blob.h',
|
| 'src/hb-buffer-private.hh',
|
| 'src/hb-buffer.cc',
|
| 'src/hb-buffer.h',
|
| - 'src/hb-common.c',
|
| + 'src/hb-common.cc',
|
| 'src/hb-common.h',
|
| - 'src/hb-font-private.h',
|
| + 'src/hb-fallback-shape-private.hh',
|
| + 'src/hb-fallback-shape.cc',
|
| + 'src/hb-font-private.hh',
|
| 'src/hb-font.cc',
|
| 'src/hb-font.h',
|
| - 'src/hb-ft.c',
|
| - 'src/hb-icu.c',
|
| - 'src/hb-language.c',
|
| - 'src/hb-language.h',
|
| - 'src/hb-object-private.h',
|
| + 'src/hb-glib.cc',
|
| + 'src/hb-glib.h',
|
| + 'src/hb-gobject-enums.cc',
|
| + 'src/hb-gobject-structs.cc',
|
| + 'src/hb-gobject.h',
|
| + 'src/hb-icu.cc',
|
| + 'src/hb-icu.h',
|
| + 'src/hb-mutex-private.hh',
|
| + 'src/hb-object-private.hh',
|
| 'src/hb-open-file-private.hh',
|
| 'src/hb-open-type-private.hh',
|
| - 'src/hb-ot-head-private.hh',
|
| + 'src/hb-ot-head-table.hh',
|
| + 'src/hb-ot-hhea-table.hh',
|
| + 'src/hb-ot-hmtx-table.hh',
|
| 'src/hb-ot-layout-common-private.hh',
|
| - 'src/hb-ot-layout-gdef-private.hh',
|
| - 'src/hb-ot-layout-gpos-private.hh',
|
| - 'src/hb-ot-layout-gsub-private.hh',
|
| + 'src/hb-ot-layout-gdef-table.hh',
|
| + 'src/hb-ot-layout-gpos-table.hh',
|
| + 'src/hb-ot-layout-gsub-table.hh',
|
| 'src/hb-ot-layout-gsubgpos-private.hh',
|
| 'src/hb-ot-layout-private.hh',
|
| 'src/hb-ot-layout.cc',
|
| + 'src/hb-ot-layout.h',
|
| 'src/hb-ot-map-private.hh',
|
| 'src/hb-ot-map.cc',
|
| - 'src/hb-ot-shape-complex-arabic-table.h',
|
| + 'src/hb-ot-maxp-table.hh',
|
| + 'src/hb-ot-name-table.hh',
|
| + 'src/hb-ot-shape-complex-arabic-table.hh',
|
| 'src/hb-ot-shape-complex-arabic.cc',
|
| + 'src/hb-ot-shape-complex-indic-machine.hh',
|
| + 'src/hb-ot-shape-complex-indic-table.hh',
|
| + 'src/hb-ot-shape-complex-indic.cc',
|
| + 'src/hb-ot-shape-complex-misc.cc',
|
| 'src/hb-ot-shape-complex-private.hh',
|
| + 'src/hb-ot-shape-normalize.cc',
|
| 'src/hb-ot-shape-private.hh',
|
| 'src/hb-ot-shape.cc',
|
| - 'src/hb-ot-tag.c',
|
| - 'src/hb-private.h',
|
| + 'src/hb-ot-shape.h',
|
| + 'src/hb-ot-tag.cc',
|
| + 'src/hb-ot-tag.h',
|
| + 'src/hb-ot.h',
|
| + 'src/hb-private.hh',
|
| 'src/hb-shape.cc',
|
| 'src/hb-shape.h',
|
| - 'src/hb-unicode-private.h',
|
| - 'src/hb-unicode.c',
|
| + 'src/hb-tt-font.cc',
|
| + 'src/hb-unicode-private.hh',
|
| + 'src/hb-unicode.cc',
|
| 'src/hb-unicode.h',
|
| + 'src/hb-version.h',
|
| 'src/hb.h',
|
| ],
|
| + 'sources/': [
|
| + ['exclude', 'src/hb-glib\\.(cc|h)$'],
|
| + ['exclude', 'src/hb-gobject.*\\.(cc|h)$'],
|
| + ],
|
| 'include_dirs': [
|
| 'src',
|
| ],
|
| @@ -62,9 +90,22 @@
|
| ],
|
| },
|
| 'dependencies': [
|
| - '../../build/linux/system.gyp:freetype2',
|
| '../../third_party/icu/icu.gyp:icuuc',
|
| ],
|
| + 'conditions': [
|
| + ['use_glib == 1', {
|
| + 'defines': [
|
| + 'HAVE_GLIB',
|
| + ],
|
| + 'sources/': [
|
| + ['include', 'src/hb-glib\\.(cc|h)$'],
|
| + ['include', 'src/hb-gobject.*\\.(cc|h)$'],
|
| + ],
|
| + 'dependencies': [
|
| + '../../base/base.gyp:base',
|
| + ],
|
| + }],
|
| + ],
|
| },
|
| ],
|
| }
|
|
|