diff options
author | Moonchild <moonchild@palemoon.org> | 2020-04-24 23:49:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-24 23:49:40 +0200 |
commit | 7a9c933a2331fdc9ba214dcb81f8c39396885a9d (patch) | |
tree | de5e3c2b926c209c5f58cb8860d09d769a6fead7 /dom/media/systemservices/moz.build | |
parent | 400e9018fd5b1b8e50ba5ea403ba98f9a658c076 (diff) | |
parent | 756162415bde12e60125f0b3a69e321c45956ae3 (diff) | |
download | UXP-7a9c933a2331fdc9ba214dcb81f8c39396885a9d.tar UXP-7a9c933a2331fdc9ba214dcb81f8c39396885a9d.tar.gz UXP-7a9c933a2331fdc9ba214dcb81f8c39396885a9d.tar.lz UXP-7a9c933a2331fdc9ba214dcb81f8c39396885a9d.tar.xz UXP-7a9c933a2331fdc9ba214dcb81f8c39396885a9d.zip |
Merge pull request #1522 from MoonchildProductions/deunify_dom
Deunify dom
Diffstat (limited to 'dom/media/systemservices/moz.build')
-rw-r--r-- | dom/media/systemservices/moz.build | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/dom/media/systemservices/moz.build b/dom/media/systemservices/moz.build index 82a5c5e72..c582b7ba1 100644 --- a/dom/media/systemservices/moz.build +++ b/dom/media/systemservices/moz.build @@ -12,7 +12,7 @@ if CONFIG['MOZ_WEBRTC']: 'LoadManagerFactory.h', 'LoadMonitor.h', ] - UNIFIED_SOURCES += [ + SOURCES += [ 'CamerasChild.cpp', 'CamerasParent.cpp', 'LoadManager.cpp', @@ -24,6 +24,7 @@ if CONFIG['MOZ_WEBRTC']: '/media/webrtc/signaling', '/media/webrtc/trunk', ] + if CONFIG['OS_TARGET'] == 'WINNT': DEFINES['WEBRTC_WIN'] = True else: @@ -34,12 +35,12 @@ if CONFIG['OS_TARGET'] == 'Android': EXPORTS += [ 'OpenSLESProvider.h' ] - UNIFIED_SOURCES += [ + SOURCES += [ 'OpenSLESProvider.cpp', ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': - UNIFIED_SOURCES += ['OSXRunLoopSingleton.cpp'] + SOURCES += ['OSXRunLoopSingleton.cpp'] EXPORTS += ['OSXRunLoopSingleton.h'] if CONFIG['_MSC_VER']: @@ -66,7 +67,8 @@ EXPORTS.mozilla.media += ['CamerasTypes.h', 'MediaTaskUtils.h', 'MediaUtils.h', ] -UNIFIED_SOURCES += [ + +SOURCES += [ 'MediaChild.cpp', 'MediaParent.cpp', 'MediaSystemResourceClient.cpp', @@ -76,11 +78,13 @@ UNIFIED_SOURCES += [ 'MediaSystemResourceService.cpp', 'MediaUtils.cpp', ] + IPDL_SOURCES += [ 'PCameras.ipdl', 'PMedia.ipdl', 'PMediaSystemResourceManager.ipdl', ] + # /dom/base needed for nsGlobalWindow.h in MediaChild.cpp LOCAL_INCLUDES += [ '/dom/base', |