mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-25 09:57:32 +09:00
Issue #80 - reinstated unified building for some large chunks of our code.
This should reduce compile complexity saving time and reducing linker stress.
This commit is contained in:
parent
66424272f3
commit
5dfded811d
115 changed files with 293 additions and 258 deletions
|
|
@ -79,7 +79,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in {
|
|||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
|
||||
DEFINES['UNICODE'] = True
|
||||
DEFINES['_UNICODE'] = True
|
||||
SOURCES += [
|
||||
UNIFIED_SOURCES += [
|
||||
'skia/src/fonts/SkFontMgr_indirect.cpp',
|
||||
'skia/src/fonts/SkRemotableFontMgr.cpp',
|
||||
]
|
||||
|
|
@ -415,7 +415,7 @@ def write_sources(f, values, indent):
|
|||
else:
|
||||
sources['unified'].add(item)
|
||||
|
||||
write_list(f, "SOURCES", sources['unified'], indent)
|
||||
write_list(f, "UNIFIED_SOURCES", sources['unified'], indent)
|
||||
write_list(f, "SOURCES", sources['nonunified'], indent)
|
||||
|
||||
def write_list(f, name, values, indent):
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ if CONFIG['MOZ_OPTIMIZE']:
|
|||
elif CONFIG['GNU_CC']:
|
||||
skia_opt_flags += ['-O2']
|
||||
|
||||
SOURCES += [
|
||||
UNIFIED_SOURCES += [
|
||||
'skia/src/core/SkAAClip.cpp',
|
||||
'skia/src/core/SkAlphaRuns.cpp',
|
||||
'skia/src/core/SkAnnotation.cpp',
|
||||
|
|
@ -308,7 +308,7 @@ SOURCES['skia/src/core/SkSpriteBlitter4f.cpp'].flags += skia_opt_flags
|
|||
SOURCES['skia/src/core/SkSpriteBlitter_ARGB32.cpp'].flags += skia_opt_flags
|
||||
SOURCES['skia/src/core/SkSpriteBlitter_RGB16.cpp'].flags += skia_opt_flags
|
||||
if CONFIG['MOZ_ENABLE_SKIA_PDF']:
|
||||
SOURCES += [
|
||||
UNIFIED_SOURCES += [
|
||||
'skia/src/core/SkMD5.cpp',
|
||||
'skia/src/pdf/SkDeflate.cpp',
|
||||
'skia/src/pdf/SkJpegInfo.cpp',
|
||||
|
|
@ -332,7 +332,7 @@ if CONFIG['MOZ_ENABLE_SKIA_PDF']:
|
|||
'skia/src/pdf/SkPDFFont.cpp',
|
||||
]
|
||||
if CONFIG['MOZ_ENABLE_SKIA_GPU']:
|
||||
SOURCES += [
|
||||
UNIFIED_SOURCES += [
|
||||
'skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp',
|
||||
'skia/src/gpu/batches/GrAnalyticRectBatch.cpp',
|
||||
'skia/src/gpu/batches/GrAtlasTextBatch.cpp',
|
||||
|
|
@ -517,7 +517,7 @@ if CONFIG['MOZ_ENABLE_SKIA_GPU']:
|
|||
'skia/src/image/SkImage_Gpu.cpp',
|
||||
]
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android'):
|
||||
SOURCES += [
|
||||
UNIFIED_SOURCES += [
|
||||
'skia/src/ports/SkDebug_android.cpp',
|
||||
'skia/src/ports/SkOSFile_posix.cpp',
|
||||
'skia/src/ports/SkOSLibrary_posix.cpp',
|
||||
|
|
@ -529,7 +529,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android'):
|
|||
'skia/src/ports/SkFontHost_FreeType_common.cpp',
|
||||
]
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] in {'cocoa', 'uikit'}:
|
||||
SOURCES += [
|
||||
UNIFIED_SOURCES += [
|
||||
'skia/src/ports/SkDebug_stdio.cpp',
|
||||
'skia/src/ports/SkOSFile_posix.cpp',
|
||||
'skia/src/ports/SkOSLibrary_posix.cpp',
|
||||
|
|
@ -542,7 +542,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in {'cocoa', 'uikit'}:
|
|||
'skia/src/ports/SkFontHost_mac.cpp',
|
||||
]
|
||||
if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
|
||||
SOURCES += [
|
||||
UNIFIED_SOURCES += [
|
||||
'skia/src/ports/SkDebug_stdio.cpp',
|
||||
'skia/src/ports/SkOSFile_posix.cpp',
|
||||
'skia/src/ports/SkOSLibrary_posix.cpp',
|
||||
|
|
@ -574,7 +574,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
|
|||
'skia/src/utils/win/SkIStream.cpp',
|
||||
]
|
||||
if CONFIG['INTEL_ARCHITECTURE']:
|
||||
SOURCES += [
|
||||
UNIFIED_SOURCES += [
|
||||
'skia/src/opts/opts_check_x86.cpp',
|
||||
]
|
||||
SOURCES += [
|
||||
|
|
@ -598,7 +598,7 @@ if CONFIG['INTEL_ARCHITECTURE']:
|
|||
SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags += skia_opt_flags
|
||||
SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += skia_opt_flags
|
||||
elif CONFIG['CPU_ARCH'] in ('arm', 'aarch64') and CONFIG['GNU_CC']:
|
||||
SOURCES += [
|
||||
UNIFIED_SOURCES += [
|
||||
'skia/src/core/SkUtilsArm.cpp',
|
||||
]
|
||||
SOURCES += [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue