Bug 979689 - Port the per-source flags for libvpx to moz.build; r=mshal

media/libvpx/Makefile.in

@@ -89,16 +89,6 @@ EXTRA_MDDEPEND_FILES = vp8_asm_enc_offsets.s.pp vp8_asm_enc_offsets.$(OBJ_SUFFIX
 
 include $(topsrcdir)/config/rules.mk
 
-# This must be after rules.mk in order to use $(OBJ_SUFFIX) outside a
-# recursively-expanded variable.
-
-# dont add for MSVC
-ifndef _MSC_VER
-%_sse2.$(OBJ_SUFFIX): CFLAGS += -msse2
-%_ssse3.$(OBJ_SUFFIX): CFLAGS += -mssse3
-%_avx2.$(OBJ_SUFFIX): CFLAGS += -mavx2
-endif
-
 quantize_sse4.$(OBJ_SUFFIX): vp8_asm_enc_offsets.asm
 quantize_ssse3.$(OBJ_SUFFIX): vp8_asm_enc_offsets.asm
 

media/libvpx/moz.build

@@ -87,3 +87,13 @@ if CONFIG['OS_TARGET'] == 'Android':
         SOURCES += [
             '%s/sources/android/cpufeatures/cpu-features.c' % CONFIG['ANDROID_NDK'],
         ]
+
+if not CONFIG['_MSC_VER']:
+    for f in SOURCES:
+        if f.endswith('.c'):
+            if 'sse2' in f:
+                SOURCES[f].flags += ['-msse2']
+            if 'ssse3' in f:
+                SOURCES[f].flags += ['-mssse3']
+            if 'avx2' in f:
+                SOURCES[f].flags += ['-mavx2']