Bug 1378529 Use the MinGW libaom configuration for MinGW builds on Linux r=rillian

MozReview-Commit-ID: 3Wn4wqH4OzQ

--HG--
extra : rebase_source : d6707934d39ddfb7539629430fc59e6c47263373
This commit is contained in:
Tom Ritter 2017-08-17 16:42:15 -05:00
parent 0d1eb15486
commit 384ce069f0

View File

@ -31,9 +31,14 @@ elif CONFIG['CPU_ARCH'] == 'x86':
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['CC_TYPE'] == 'gcc':
ASFLAGS += [ '-I%s/media/libaom/config/win/mingw32/' % TOPSRCDIR ]
CFLAGS += [ '-I%s/media/libaom/config/win/mingw32/' % TOPSRCDIR ]
EXPORTS.aom += [ 'config/win/mingw32/aom_config.h' ]
else:
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' ]
else: # Android, Linux, BSDs, etc.
ASFLAGS += [ '-I%s/media/libaom/config/linux/ia32/' % TOPSRCDIR ]
CFLAGS += [ '-I%s/media/libaom/config/linux/ia32/' % TOPSRCDIR ]