diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-06-01 21:58:35 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-06-01 21:58:35 +0000 |
| commit | c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810 (patch) | |
| tree | c7672903a2030d37f861b12900165a015f49d10a /gfx/graphite2/src/moz.build | |
| parent | 451509e2c0188a4164d4b3d1d9f5839ed1e95246 (diff) | |
| parent | 744b044935f7d1d67fbe0df42d898efcbdd00536 (diff) | |
| download | UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar.gz UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar.lz UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar.xz UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.zip | |
Merge remote-tracking branch 'origin/redwood' into release
Diffstat (limited to 'gfx/graphite2/src/moz.build')
| -rw-r--r-- | gfx/graphite2/src/moz.build | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/gfx/graphite2/src/moz.build b/gfx/graphite2/src/moz.build index c95c2089d..4cbb1f7ed 100644 --- a/gfx/graphite2/src/moz.build +++ b/gfx/graphite2/src/moz.build @@ -13,16 +13,16 @@ EXPORTS.graphite2 += [ ] if CONFIG['GNU_CC']: - UNIFIED_SOURCES += [ + SOURCES += [ 'direct_machine.cpp' ] else: - UNIFIED_SOURCES += [ + SOURCES += [ 'call_machine.cpp' ] # This should contain all of the _SOURCES from files.mk, except *_machine.cpp -UNIFIED_SOURCES += [ +SOURCES += [ 'CachedFace.cpp', 'CmapCache.cpp', 'Code.cpp', @@ -44,6 +44,7 @@ UNIFIED_SOURCES += [ 'Intervals.cpp', 'json.cpp', 'Justifier.cpp', + 'NameTable.cpp', 'Pass.cpp', 'Position.cpp', 'SegCache.cpp', @@ -57,12 +58,6 @@ UNIFIED_SOURCES += [ 'UtfCodec.cpp', ] -# Excluded from UNIFIED_SOURCES because <cmath> from other files breaks it, -# see bug 1272647. -SOURCES += [ - 'NameTable.cpp', -] - # tell graphite2 not to export symbols, we'll be linking it directly with # thebes DEFINES['GRAPHITE2_STATIC'] = True |