Revert "[harfbuzz-subset.cc] Trim down!"

This reverts commit a335458d57.

While this can be vastly trimmed down, what I did is not right.
It still depends on hb-face, hb-font, hb-blob, hb-set, and hb-map.
This commit is contained in:
Behdad Esfahbod 2022-12-04 15:03:36 -07:00
parent a335458d57
commit 2c0abf0258
2 changed files with 46 additions and 1 deletions

View File

@ -1,8 +1,51 @@
#include "graph/gsubgpos-context.cc" #include "graph/gsubgpos-context.cc"
#include "hb-aat-layout.cc"
#include "hb-aat-map.cc"
#include "hb-blob.cc"
#include "hb-buffer-serialize.cc"
#include "hb-buffer-verify.cc"
#include "hb-buffer.cc"
#include "hb-common.cc"
#include "hb-draw.cc"
#include "hb-face.cc"
#include "hb-fallback-shape.cc"
#include "hb-font.cc"
#include "hb-map.cc"
#include "hb-number.cc" #include "hb-number.cc"
#include "hb-ot-cff1-table.cc" #include "hb-ot-cff1-table.cc"
#include "hb-ot-cff2-table.cc" #include "hb-ot-cff2-table.cc"
#include "hb-ot-color.cc"
#include "hb-ot-face.cc"
#include "hb-ot-font.cc"
#include "hb-ot-layout.cc"
#include "hb-ot-map.cc"
#include "hb-ot-math.cc"
#include "hb-ot-meta.cc"
#include "hb-ot-metrics.cc"
#include "hb-ot-name.cc"
#include "hb-ot-shape-fallback.cc"
#include "hb-ot-shape-normalize.cc"
#include "hb-ot-shape.cc"
#include "hb-ot-shaper-arabic.cc"
#include "hb-ot-shaper-default.cc"
#include "hb-ot-shaper-hangul.cc"
#include "hb-ot-shaper-hebrew.cc"
#include "hb-ot-shaper-indic-table.cc"
#include "hb-ot-shaper-indic.cc"
#include "hb-ot-shaper-khmer.cc"
#include "hb-ot-shaper-myanmar.cc"
#include "hb-ot-shaper-syllabic.cc"
#include "hb-ot-shaper-thai.cc"
#include "hb-ot-shaper-use.cc"
#include "hb-ot-shaper-vowel-constraints.cc"
#include "hb-ot-tag.cc"
#include "hb-ot-var.cc"
#include "hb-set.cc"
#include "hb-shape-plan.cc"
#include "hb-shape.cc"
#include "hb-shaper.cc"
#include "hb-static.cc" #include "hb-static.cc"
#include "hb-style.cc"
#include "hb-subset-cff-common.cc" #include "hb-subset-cff-common.cc"
#include "hb-subset-cff1.cc" #include "hb-subset-cff1.cc"
#include "hb-subset-cff2.cc" #include "hb-subset-cff2.cc"
@ -10,3 +53,5 @@
#include "hb-subset-plan.cc" #include "hb-subset-plan.cc"
#include "hb-subset-repacker.cc" #include "hb-subset-repacker.cc"
#include "hb-subset.cc" #include "hb-subset.cc"
#include "hb-ucd.cc"
#include "hb-unicode.cc"

View File

@ -558,7 +558,7 @@ libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources,
custom_target('harfbuzz-subset.cc', custom_target('harfbuzz-subset.cc',
build_by_default: true, build_by_default: true,
output: 'harfbuzz-subset.cc', output: 'harfbuzz-subset.cc',
input: hb_subset_sources, input: hb_base_sources + hb_subset_sources,
command: [find_program('gen-harfbuzzcc.py'), command: [find_program('gen-harfbuzzcc.py'),
'@OUTPUT@', meson.current_source_dir(), '@INPUT@'], '@OUTPUT@', meson.current_source_dir(), '@INPUT@'],
) )