diff options
| -rw-r--r-- | media/libaom/moz.build | 50 |
1 files changed, 31 insertions, 19 deletions
diff --git a/media/libaom/moz.build b/media/libaom/moz.build index e50d579e4..5b7dde9b7 100644 --- a/media/libaom/moz.build +++ b/media/libaom/moz.build @@ -15,37 +15,49 @@ if CONFIG['CPU_ARCH'] == 'x86_64': SOURCES += files['X64_SOURCES'] USE_YASM = True if CONFIG['OS_TARGET'] == 'WINNT': - ASFLAGS += [ '-I%s/media/libaom/config/win/x64/' % TOPSRCDIR ] - CFLAGS += [ '-I%s/media/libaom/config/win/x64/' % TOPSRCDIR ] - EXPORTS.aom += [ 'config/win/x64/aom_config.h' ] + if CONFIG['GNU_CC'] + ASFLAGS += [ '-I%s/media/libaom/config/win/mingw64/' % TOPSRCDIR ] + LOCAL_INCLUDES += [ '/media/libaom/config/win/mingw64/' ] + EXPORTS.aom += [ 'config/win/mingw64/config/aom_config.h' ] + else: + ASFLAGS += [ '-I%s/media/libaom/config/win/x64/' % TOPSRCDIR ] + LOCAL_INCLUDES += [ '/media/libaom/config/win/x64/' ] + EXPORTS.aom += [ 'config/win/x64/config/aom_config.h' ] + NO_PGO = True elif CONFIG['OS_TARGET'] == 'Darwin': ASFLAGS += [ '-I%s/media/libaom/config/mac/x64/' % TOPSRCDIR ] - CFLAGS += [ '-I%s/media/libaom/config/mac/x64/' % TOPSRCDIR ] - EXPORTS.aom += [ 'config/mac/x64/aom_config.h' ] + LOCAL_INCLUDES += [ '/media/libaom/config/mac/x64/' ] + EXPORTS.aom += [ 'config/mac/x64/config/aom_config.h' ] else: # Android, Linux, BSDs, etc. ASFLAGS += [ '-I%s/media/libaom/config/linux/x64/' % TOPSRCDIR ] - CFLAGS += [ '-I%s/media/libaom/config/linux/x64/' % TOPSRCDIR ] - EXPORTS.aom += [ 'config/linux/x64/aom_config.h' ] + LOCAL_INCLUDES += [ '/media/libaom/config/linux/x64/' ] + EXPORTS.aom += [ 'config/linux/x64/config/aom_config.h' ] elif CONFIG['CPU_ARCH'] == 'x86': EXPORTS.aom += files['IA32_EXPORTS'] SOURCES += files['IA32_SOURCES'] USE_YASM = True if CONFIG['OS_TARGET'] == 'WINNT': - ASFLAGS += [ '-I%s/media/libaom/config/win/ia32/' % TOPSRCDIR ] - CFLAGS += [ '-I%s/media/libaom/config/win/ia32/' % TOPSRCDIR ] - EXPORTS.aom += [ 'config/win/ia32/aom_config.h' ] + if CONFIG['GNU_CC'] + ASFLAGS += [ '-I%s/media/libaom/config/win/mingw32/' % TOPSRCDIR ] + LOCAL_INCLUDES += [ '/media/libaom/config/win/mingw32/' ] + EXPORTS.aom += [ 'config/win/mingw32/config/aom_config.h' ] + else: + ASFLAGS += [ '-I%s/media/libaom/config/win/ia32/' % TOPSRCDIR ] + LOCAL_INCLUDES += [ '/media/libaom/config/win/ia32/' ] + EXPORTS.aom += [ 'config/win/ia32/config/aom_config.h' ] + NO_PGO = True else: # Android, Linux, BSDs, etc. ASFLAGS += [ '-I%s/media/libaom/config/linux/ia32/' % TOPSRCDIR ] - CFLAGS += [ '-I%s/media/libaom/config/linux/ia32/' % TOPSRCDIR ] - EXPORTS.aom += [ 'config/linux/ia32/aom_config.h' ] + LOCAL_INCLUDES += [ '/media/libaom/config/linux/ia32/' ] + EXPORTS.aom += [ 'config/linux/ia32/config/aom_config.h' ] elif CONFIG['CPU_ARCH'] == 'arm': EXPORTS.aom += files['ARM_EXPORTS'] ASFLAGS += [ '-I%s/media/libaom/config/linux/arm/' % TOPSRCDIR, '-I%s/libaom' % OBJDIR, ] - CFLAGS += [ '-I%s/media/libaom/config/linux/arm/' % TOPSRCDIR ] - EXPORTS.aom += [ 'config/linux/arm/aom_config.h' ] + LOCAL_INCLUDES += [ '/media/libaom/config/linux/arm/' ] + EXPORTS.aom += [ 'config/linux/arm/config/aom_config.h' ] arm_asm_files = files['ARM_SOURCES'] @@ -74,8 +86,8 @@ else: EXPORTS.aom += files['GENERIC_EXPORTS'] SOURCES += files['GENERIC_SOURCES'] ASFLAGS += [ '-I%s/media/libaom/config/generic/' % TOPSRCDIR ] - CFLAGS += [ '-I%s/media/libaom/config/generic/' % TOPSRCDIR ] - EXPORTS.aom += [ 'config/generic/aom_config.h' ] + LOCAL_INCLUDES += [ '/media/libaom/config/generic/' ] + EXPORTS.aom += [ 'config/generic/config/aom_config.h' ] # We allow warnings for third-party code that can be updated from upstream. ALLOW_COMPILER_WARNINGS = True @@ -125,7 +137,7 @@ ASFLAGS += [ '-I%s/third_party/aom' % TOPSRCDIR, ] -CFLAGS += [ - '-I%s/third_party/aom' % TOPSRCDIR, - '-I%s/media/libaom/config' % TOPSRCDIR, # aom_version.h +LOCAL_INCLUDES += [ + '/media/libaom/config', # aom_version.h + '/third_party/aom', ] |