Bug 1378529 Use the MinGW libaom configuration for MinGW builds on Linux draft
authorTom Ritter <tom@mozilla.com>
Thu, 17 Aug 2017 16:42:15 -0500
changeset 648524 3d11fa2d0a27e14923d8c5df3601934d109c914c
parent 646681 cba7a04afc91f4037248704994877b90e670f8eb
child 648932 db99d83370bfc26e762070d675441eaf69bb777f
push id74779
push userbmo:tom@mozilla.com
push dateThu, 17 Aug 2017 21:43:22 +0000
bugs1378529
milestone57.0a1
Bug 1378529 Use the MinGW libaom configuration for MinGW builds on Linux MozReview-Commit-ID: 3Wn4wqH4OzQ
media/libaom/moz.build
--- a/media/libaom/moz.build
+++ b/media/libaom/moz.build
@@ -26,19 +26,24 @@ if CONFIG['CPU_ARCH'] == 'x86_64':
         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' ]
 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['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 ]
         EXPORTS.aom += [ 'config/linux/ia32/aom_config.h' ]
 elif CONFIG['CPU_ARCH'] == 'arm':
     EXPORTS.aom += files['ARM_EXPORTS']
     ASFLAGS += [
         '-I%s/media/libaom/config/linux/arm/' % TOPSRCDIR,