mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-10-25 08:37:30 +09:00
Revert "Issue #61 - Place Skia in libxul"
This reverts commit 39cebe99e2db22d9e725499bf309b5668fcee413.
This commit is contained in:
parent
733451d1bb
commit
260f8e154a
1 changed files with 6 additions and 2 deletions
|
|
@ -646,8 +646,7 @@ else:
|
||||||
# We allow warnings for third-party code that can be updated from upstream.
|
# We allow warnings for third-party code that can be updated from upstream.
|
||||||
ALLOW_COMPILER_WARNINGS = True
|
ALLOW_COMPILER_WARNINGS = True
|
||||||
|
|
||||||
FINAL_LIBRARY = 'xul'
|
FINAL_LIBRARY = 'gkmedias'
|
||||||
|
|
||||||
LOCAL_INCLUDES += [
|
LOCAL_INCLUDES += [
|
||||||
'skia/include/c',
|
'skia/include/c',
|
||||||
'skia/include/config',
|
'skia/include/config',
|
||||||
|
|
@ -694,6 +693,11 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
|
||||||
'skia/src/fonts/SkRemotableFontMgr.cpp',
|
'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.
|
# We should autogenerate these SSE related flags.
|
||||||
|
|
||||||
if CONFIG['_MSC_VER']:
|
if CONFIG['_MSC_VER']:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue