Bug 939018 - Build media/libnestegg, libogg, libsoundtouch, and libth…

…eora in unified mode. r=ehsan
mozilla-spidermonkey · Nov 12, 2013 · dc191d7 · dc191d7
1 parent ed0f12c
commit dc191d7
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/media/libnestegg/src/moz.build b/media/libnestegg/src/moz.build
@@ -6,7 +6,7 @@
 
 MODULE = 'nestegg'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'halloc.c',
     'nestegg.c',
 ]

diff --git a/media/libogg/moz.build b/media/libogg/moz.build
@@ -14,7 +14,7 @@ EXPORTS.ogg += [
 
 LIBRARY_NAME = 'ogg'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'src/ogg_bitwise.c',
     'src/ogg_framing.c',
 ]

diff --git a/media/libogg/src/moz.build b/media/libogg/src/moz.build
@@ -6,7 +6,7 @@
 
 MODULE = 'ogg'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'ogg_bitwise.c',
     'ogg_framing.c',
 ]

diff --git a/media/libsoundtouch/src/moz.build b/media/libsoundtouch/src/moz.build
@@ -13,7 +13,7 @@ EXPORTS.soundtouch += [
     'STTypes.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'AAFilter.cpp',
     'cpu_detect_x86.cpp',
     'FIFOSampleBuffer.cpp',
@@ -25,11 +25,11 @@ SOURCES += [
 
 if CONFIG['INTEL_ARCHITECTURE']:
     if CONFIG['MOZ_SAMPLE_TYPE_FLOAT32']:
-        SOURCES += [
+        UNIFIED_SOURCES += [
             'sse_optimized.cpp',
         ]
     else:
-        SOURCES += [
+        UNIFIED_SOURCES += [
             'mmx_optimized.cpp',
         ]
 

diff --git a/media/libtheora/lib/moz.build b/media/libtheora/lib/moz.build
@@ -8,7 +8,7 @@ MODULE = 'theora'
 
 LIBRARY_NAME = 'theora'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'apiwrapper.c',
     'bitpack.c',
     'decapiwrapper.c',