diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-04-22 20:34:35 +0000 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-26 10:19:33 +0200 |
| commit | 594cbca6d1209afbed3c9af99522d9e80fd613ab (patch) | |
| tree | 0967a67fee61adb70231eb68b541c71f51411519 /dom/plugins/ipc/moz.build | |
| parent | a4ba2609049d30aa8c5cc552e4137ad73af897f2 (diff) | |
| download | UXP-594cbca6d1209afbed3c9af99522d9e80fd613ab.tar UXP-594cbca6d1209afbed3c9af99522d9e80fd613ab.tar.gz UXP-594cbca6d1209afbed3c9af99522d9e80fd613ab.tar.lz UXP-594cbca6d1209afbed3c9af99522d9e80fd613ab.tar.xz UXP-594cbca6d1209afbed3c9af99522d9e80fd613ab.zip | |
Issue #80 - De-unify dom/plugins/ipc
Diffstat (limited to 'dom/plugins/ipc/moz.build')
| -rw-r--r-- | dom/plugins/ipc/moz.build | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/dom/plugins/ipc/moz.build b/dom/plugins/ipc/moz.build index 051d5a3b4..182a11562 100644 --- a/dom/plugins/ipc/moz.build +++ b/dom/plugins/ipc/moz.build @@ -48,13 +48,11 @@ if CONFIG['OS_ARCH'] == 'WINNT': EXPORTS.mozilla.plugins += [ 'PluginSurfaceParent.h', ] - UNIFIED_SOURCES += [ + SOURCES += [ + 'MiniShmParent.cpp', 'PluginHangUIParent.cpp', 'PluginSurfaceParent.cpp', ] - SOURCES += [ - 'MiniShmParent.cpp', # Issues with CreateEvent - ] DEFINES['MOZ_HANGUI_PROCESS_NAME'] = '"plugin-hang-ui%s"' % CONFIG['BIN_SUFFIX'] LOCAL_INCLUDES += [ '/widget', @@ -66,15 +64,17 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': 'PluginInterposeOSX.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'BrowserStreamChild.cpp', 'BrowserStreamParent.cpp', 'ChildAsyncCall.cpp', 'ChildTimer.cpp', 'PluginAsyncSurrogate.cpp', 'PluginBackgroundDestroyer.cpp', + 'PluginInstanceChild.cpp', 'PluginInstanceParent.cpp', 'PluginMessageUtils.cpp', + 'PluginModuleChild.cpp', 'PluginModuleParent.cpp', 'PluginProcessChild.cpp', 'PluginProcessParent.cpp', @@ -83,23 +83,18 @@ UNIFIED_SOURCES += [ 'PluginScriptableObjectParent.cpp', 'PluginStreamChild.cpp', 'PluginStreamParent.cpp', -] - -SOURCES += [ - 'PluginInstanceChild.cpp', # 'PluginThreadCallback' : ambiguous symbol - 'PluginModuleChild.cpp', # Redefinition of mozilla::WindowsDllInterceptor sUser32Intercept 'PluginWidgetChild.cpp', 'PluginWidgetParent.cpp', ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': - UNIFIED_SOURCES += [ + SOURCES += [ 'PluginInterposeOSX.mm', 'PluginUtilsOSX.mm', ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': - UNIFIED_SOURCES += [ + SOURCES += [ 'D3D11SurfaceHolder.cpp', 'PluginUtilsWin.cpp' ] |