diff options
Diffstat (limited to '')
| -rw-r--r-- | media/libvpx/moz.build | 57 |
1 files changed, 29 insertions, 28 deletions
diff --git a/media/libvpx/moz.build b/media/libvpx/moz.build index 635b5d0fdd..df29c9aae8 100644 --- a/media/libvpx/moz.build +++ b/media/libvpx/moz.build @@ -14,45 +14,46 @@ if CONFIG['VPX_USE_NASM']: # Linux, Mac and Win share file lists for x86* but not configurations. if CONFIG['TARGET_CPU'] == 'x86_64': - EXPORTS.vpx += files['X64_EXPORTS'] - SOURCES += files['X64_SOURCES'] if CONFIG['OS_TARGET'] == 'WINNT': + EXPORTS.vpx += files['WIN_X64_EXPORTS'] + SOURCES += files['WIN_X64_SOURCES'] ASFLAGS += [ '-I%s/media/libvpx/config/win/x64/' % TOPSRCDIR ] LOCAL_INCLUDES += [ '/media/libvpx/config/win/x64/' ] - SOURCES += [ '/media/libvpx/config/win/x64/vpx_config.c' ] elif CONFIG['OS_TARGET'] == 'Darwin': + EXPORTS.vpx += files['MAC_X64_EXPORTS'] + SOURCES += files['MAC_X64_SOURCES'] ASFLAGS += [ '-I%s/media/libvpx/config/mac/x64/' % TOPSRCDIR ] LOCAL_INCLUDES += [ '/media/libvpx/config/mac/x64/' ] - SOURCES += [ '/media/libvpx/config/mac/x64/vpx_config.c' ] else: # Android, Linux, BSDs, etc. + EXPORTS.vpx += files['LINUX_X64_EXPORTS'] + SOURCES += files['LINUX_X64_SOURCES'] ASFLAGS += [ '-I%s/media/libvpx/config/linux/x64/' % TOPSRCDIR ] LOCAL_INCLUDES += [ '/media/libvpx/config/linux/x64/' ] - SOURCES += [ '/media/libvpx/config/linux/x64/vpx_config.c' ] elif CONFIG['TARGET_CPU'] == 'x86': - EXPORTS.vpx += files['IA32_EXPORTS'] - SOURCES += files['IA32_SOURCES'] if CONFIG['OS_TARGET'] == 'WINNT': + EXPORTS.vpx += files['WIN_IA32_EXPORTS'] + SOURCES += files['WIN_IA32_SOURCES'] ASFLAGS += [ '-I%s/media/libvpx/config/win/ia32/' % TOPSRCDIR ] LOCAL_INCLUDES += [ '/media/libvpx/config/win/ia32/' ] - SOURCES += [ '/media/libvpx/config/win/ia32/vpx_config.c' ] elif CONFIG['OS_TARGET'] == 'Darwin': + EXPORTS.vpx += files['MAC_IA32_EXPORTS'] + SOURCES += files['MAC_IA32_SOURCES'] ASFLAGS += [ '-I%s/media/libvpx/config/mac/ia32/' % TOPSRCDIR ] LOCAL_INCLUDES += [ '/media/libvpx/config/mac/ia32/' ] - SOURCES += [ '/media/libvpx/config/mac/ia32/vpx_config.c' ] else: # Android, Linux, BSDs, etc. + EXPORTS.vpx += files['LINUX_IA32_EXPORTS'] + SOURCES += files['LINUX_IA32_SOURCES'] ASFLAGS += [ '-I%s/media/libvpx/config/linux/ia32/' % TOPSRCDIR ] LOCAL_INCLUDES += [ '/media/libvpx/config/linux/ia32/' ] - SOURCES += [ '/media/libvpx/config/linux/ia32/vpx_config.c' ] elif CONFIG['TARGET_CPU'] == 'arm': - EXPORTS.vpx += files['ARM_EXPORTS'] + EXPORTS.vpx += files['LINUX_ARM_EXPORTS'] ASFLAGS += [ '-I%s/media/libvpx/config/linux/arm/' % TOPSRCDIR, '-I%s/libvpx' % OBJDIR, ] LOCAL_INCLUDES += [ '/media/libvpx/config/linux/arm/' ] - SOURCES += [ '/media/libvpx/config/linux/arm/vpx_config.c' ] - arm_asm_files = files['ARM_SOURCES'] + arm_asm_files = files['LINUX_ARM_SOURCES'] if CONFIG['GNU_AS']: SOURCES += sorted([ @@ -70,28 +71,28 @@ elif CONFIG['TARGET_CPU'] == 'arm': LOCAL_INCLUDES += [ '%%%s/sources/android/cpufeatures' % CONFIG['ANDROID_NDK'], ] -elif CONFIG['TARGET_CPU'] == 'aarch64' and CONFIG['OS_TARGET'] == 'WINNT': - EXPORTS.vpx += files['ARM64_EXPORTS'] - # Bug 1885585: clang on win/aarch64 cannot compile SVInt8_t type for now. - SOURCES += [ - f for f in files['ARM64_SOURCES'] if not f.endswith('_sve.c') - ] - ASFLAGS += [ '-I%s/media/libvpx/config/win/aarch64/' % TOPSRCDIR ] - LOCAL_INCLUDES += [ '/media/libvpx/config/win/aarch64/' ] - SOURCES += [ '/media/libvpx/config/win/aarch64/vpx_config.c' ] elif CONFIG['TARGET_CPU'] == 'aarch64': - EXPORTS.vpx += files['ARM64_EXPORTS'] - SOURCES += files['ARM64_SOURCES'] - ASFLAGS += [ '-I%s/media/libvpx/config/linux/arm64/' % TOPSRCDIR ] - LOCAL_INCLUDES += [ '/media/libvpx/config/linux/arm64/' ] - SOURCES += [ '/media/libvpx/config/linux/arm64/vpx_config.c' ] + if CONFIG['OS_TARGET'] == 'WINNT': + EXPORTS.vpx += files['WIN_AARCH64_EXPORTS'] + SOURCES += files['WIN_AARCH64_SOURCES'] + ASFLAGS += [ '-I%s/media/libvpx/config/win/aarch64/' % TOPSRCDIR ] + LOCAL_INCLUDES += [ '/media/libvpx/config/win/aarch64/' ] + elif CONFIG['OS_TARGET'] == 'Darwin': + EXPORTS.vpx += files['MAC_ARM64_EXPORTS'] + SOURCES += files['MAC_ARM64_SOURCES'] + ASFLAGS += [ '-I%s/media/libvpx/config/mac/arm64/' % TOPSRCDIR ] + LOCAL_INCLUDES += [ '/media/libvpx/config/mac/arm64/' ] + else: # Android, Linux, BSDs, etc. + EXPORTS.vpx += files['LINUX_ARM64_EXPORTS'] + SOURCES += files['LINUX_ARM64_SOURCES'] + ASFLAGS += [ '-I%s/media/libvpx/config/linux/arm64/' % TOPSRCDIR ] + LOCAL_INCLUDES += [ '/media/libvpx/config/linux/arm64/' ] else: # Generic C-only configuration EXPORTS.vpx += files['GENERIC_EXPORTS'] SOURCES += files['GENERIC_SOURCES'] ASFLAGS += [ '-I%s/media/libvpx/config/generic/' % TOPSRCDIR ] LOCAL_INCLUDES += [ '/media/libvpx/config/generic/' ] - SOURCES += [ '/media/libvpx/config/generic/vpx_config.c' ] # We allow warnings for third-party code that can be updated from upstream. AllowCompilerWarnings() |