mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-05 07:18:39 +09:00
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.
This commit is contained in:
parent
371d7cf05d
commit
6b3767c443
1 changed files with 2 additions and 6 deletions
|
|
@ -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']:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue