diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-22 15:14:53 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-22 15:14:53 +0200 |
| commit | 400e9018fd5b1b8e50ba5ea403ba98f9a658c076 (patch) | |
| tree | d43e5e71790e07a7535eab9067ecd72f9881fc53 /dom/media/moz.build | |
| parent | b5b62d841c733dcb62112f3158f1488e670671d6 (diff) | |
| download | uxp-400e9018fd5b1b8e50ba5ea403ba98f9a658c076.tar.gz | |
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 4cb514a084..41267a6ef4 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']: |