diff options
| author | Moonchild <moonchild@palemoon.org> | 2021-01-03 21:45:04 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2021-01-03 21:45:04 +0000 |
| commit | 39cebe99e2db22d9e725499bf309b5668fcee413 (patch) | |
| tree | 549141e819a435661f7edc556f647eba646c52eb | |
| parent | b713575ca4d0f8d16639899e929e2048cbcb4221 (diff) | |
| download | UXP-39cebe99e2db22d9e725499bf309b5668fcee413.tar UXP-39cebe99e2db22d9e725499bf309b5668fcee413.tar.gz UXP-39cebe99e2db22d9e725499bf309b5668fcee413.tar.lz UXP-39cebe99e2db22d9e725499bf309b5668fcee413.tar.xz UXP-39cebe99e2db22d9e725499bf309b5668fcee413.zip | |
Issue #61 - Place Skia in libxul
Skia does some nasty things that break with DLL calls like having virtual dtors
without a body definition (and it's honestly surprising that it even builds to
begin with the way it's done, but apparently they use some linking symbol voodoo
to work around that in dependent classes).
Not wanting to have to pull Google code apart to try and fix that for something
we're only using for canvas anyway, it's better to just let Skia reside in
libxul instead.
| -rw-r--r-- | gfx/skia/moz.build | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build index 4ef5060b0..c218f6477 100644 --- a/gfx/skia/moz.build +++ b/gfx/skia/moz.build @@ -646,7 +646,8 @@ else: # We allow warnings for third-party code that can be updated from upstream. ALLOW_COMPILER_WARNINGS = True -FINAL_LIBRARY = 'gkmedias' +FINAL_LIBRARY = 'xul' + LOCAL_INCLUDES += [ 'skia/include/c', 'skia/include/config', @@ -693,11 +694,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': 'skia/src/fonts/SkRemotableFontMgr.cpp', ] -if CONFIG['GKMEDIAS_SHARED_LIBRARY']: - DEFINES['SKIA_DLL'] = 1 - DEFINES['GR_DLL'] = 1 - DEFINES['SK_FONT_HOST_USE_SYSTEM_SETTINGS'] = 1 - # We should autogenerate these SSE related flags. if CONFIG['_MSC_VER']: |