diff options
author | Moonchild <moonchild@palemoon.org> | 2020-04-22 13:17:28 +0000 |
---|---|---|
committer | Moonchild <moonchild@palemoon.org> | 2020-04-22 13:17:28 +0000 |
commit | 6f37b2107aaa44a02a3c9abb015d2a65cb9bebee (patch) | |
tree | 0f8b70200fa1800ae93a8047c1218b3645c2eb53 /dom/media/moz.build | |
parent | 2bfcaa29ac39c995af0bd5b9efcddbfdeb84be76 (diff) | |
download | UXP-6f37b2107aaa44a02a3c9abb015d2a65cb9bebee.tar UXP-6f37b2107aaa44a02a3c9abb015d2a65cb9bebee.tar.gz UXP-6f37b2107aaa44a02a3c9abb015d2a65cb9bebee.tar.lz UXP-6f37b2107aaa44a02a3c9abb015d2a65cb9bebee.tar.xz UXP-6f37b2107aaa44a02a3c9abb015d2a65cb9bebee.zip |
Revert "Issue #80 - De-unify dom/media part 1"
This reverts commit b5b62d841c733dcb62112f3158f1488e670671d6.
Diffstat (limited to 'dom/media/moz.build')
-rw-r--r-- | dom/media/moz.build | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/dom/media/moz.build b/dom/media/moz.build index 4cb514a08..41267a6ef 100644 --- a/dom/media/moz.build +++ b/dom/media/moz.build @@ -184,7 +184,7 @@ EXPORTS.mozilla.dom += [ 'VideoTrackList.h', ] -SOURCES += [ +UNIFIED_SOURCES += [ 'AccurateSeekTask.cpp', 'ADTSDecoder.cpp', 'ADTSDemuxer.cpp', @@ -201,7 +201,6 @@ SOURCES += [ 'CanvasCaptureMediaStream.cpp', 'CubebUtils.cpp', 'DecoderDoctorDiagnostics.cpp', - 'DecoderTraits.cpp', 'DOMMediaStream.cpp', 'EncodedBufferCache.cpp', 'FileBlockCache.cpp', @@ -257,6 +256,11 @@ SOURCES += [ if CONFIG['OS_TARGET'] == 'WINNT': SOURCES += [ 'ThreadPoolCOMListener.cpp' ] +# DecoderTraits.cpp needs to be built separately because of Mac OS X headers. +SOURCES += [ + 'DecoderTraits.cpp', +] + # Some codec-related code uses multi-character constants, which GCC and clang # warn about. Suppress turning this warning into an error. if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']: |