diff options
| author | Moonchild <moonchild@palemoon.org> | 2021-11-19 19:15:41 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-04-05 19:21:29 +0200 |
| commit | 97f911427a49c410644ff54b2dcaab832636113b (patch) | |
| tree | 73e59c36623477657795a3a1e9d8a530d943e857 | |
| parent | 3b575dfced55cf78871937b6bd41942374c95390 (diff) | |
| download | uxp-97f911427a49c410644ff54b2dcaab832636113b.tar.gz | |
Issue #1795 - Remove support for building without DirectWrite.
| -rw-r--r-- | gfx/cairo/cairo/src/moz.build | 5 | ||||
| -rw-r--r-- | gfx/thebes/moz.build | 9 | ||||
| -rw-r--r-- | old-configure.in | 2 |
3 files changed, 4 insertions, 12 deletions
diff --git a/gfx/cairo/cairo/src/moz.build b/gfx/cairo/cairo/src/moz.build index 6d6f7c9d55..75201123ce 100644 --- a/gfx/cairo/cairo/src/moz.build +++ b/gfx/cairo/cairo/src/moz.build @@ -36,15 +36,12 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': EXPORTS.cairo += [ 'cairo-win32.h', ] - if CONFIG['MOZ_ENABLE_DWRITE_FONT']: - SOURCES += [ - 'cairo-dwrite-font.cpp', - ] if CONFIG['MOZ_ENABLE_D2D_SURFACE']: SOURCES += [ 'cairo-d2d-surface.cpp', ] SOURCES += [ + 'cairo-dwrite-font.cpp', 'cairo-win32-font.c', 'cairo-win32-surface.c', ] diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build index bee77cbbec..be28f4e51c 100644 --- a/gfx/thebes/moz.build +++ b/gfx/thebes/moz.build @@ -105,6 +105,9 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': 'PrintTargetWindows.h', ] SOURCES += [ + 'gfxDWriteCommon.cpp', + 'gfxDWriteFontList.cpp', + 'gfxDWriteFonts.cpp', 'gfxGDIFont.cpp', 'gfxGDIFontList.cpp', 'gfxWindowsNativeDrawing.cpp', @@ -113,12 +116,6 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': 'PrintTargetPDF.cpp', 'PrintTargetWindows.cpp', ] - if CONFIG['MOZ_ENABLE_DWRITE_FONT']: - SOURCES += [ - 'gfxDWriteCommon.cpp', - 'gfxDWriteFontList.cpp', - 'gfxDWriteFonts.cpp', - ] # Are we targeting x86 or x64? If so, build gfxAlphaRecoverySSE2.cpp. if CONFIG['INTEL_ARCHITECTURE']: diff --git a/old-configure.in b/old-configure.in index 60c070b9cd..faed99df57 100644 --- a/old-configure.in +++ b/old-configure.in @@ -4424,7 +4424,6 @@ if test "$MOZ_TREE_CAIRO"; then WIN32_FONT_FEATURE="#define CAIRO_HAS_WIN32_FONT 1" WIN32_SURFACE_FEATURE="#define CAIRO_HAS_WIN32_SURFACE 1" MOZ_ENABLE_D2D_SURFACE=1 - MOZ_ENABLE_DWRITE_FONT=1 if test "$COMPILE_ENVIRONMENT"; then @@ -4439,7 +4438,6 @@ if test "$MOZ_TREE_CAIRO"; then FC_FONT_FEATURE="#define CAIRO_HAS_FC_FONT 1" fi AC_SUBST(MOZ_ENABLE_CAIRO_FT) - AC_SUBST(MOZ_ENABLE_DWRITE_FONT) AC_SUBST(MOZ_ENABLE_D2D_SURFACE) AC_SUBST(MOZ_ENABLE_D3D10_LAYER) |