diff options
author | Moonchild <moonchild@palemoon.org> | 2020-04-22 20:04:53 +0000 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-26 10:19:22 +0200 |
commit | a4ba2609049d30aa8c5cc552e4137ad73af897f2 (patch) | |
tree | 566dddee61f9e30052891f84c31237911a1af835 /dom/plugins/base/moz.build | |
parent | 4a8c186eea0b25416ce3e47719658a42df9fddcf (diff) | |
download | UXP-a4ba2609049d30aa8c5cc552e4137ad73af897f2.tar UXP-a4ba2609049d30aa8c5cc552e4137ad73af897f2.tar.gz UXP-a4ba2609049d30aa8c5cc552e4137ad73af897f2.tar.lz UXP-a4ba2609049d30aa8c5cc552e4137ad73af897f2.tar.xz UXP-a4ba2609049d30aa8c5cc552e4137ad73af897f2.zip |
Issue #80 - De-unify dom/plugins/base
Diffstat (limited to 'dom/plugins/base/moz.build')
-rw-r--r-- | dom/plugins/base/moz.build | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/dom/plugins/base/moz.build b/dom/plugins/base/moz.build index a159d6fc1..d63ca51ce 100644 --- a/dom/plugins/base/moz.build +++ b/dom/plugins/base/moz.build @@ -38,10 +38,12 @@ EXPORTS.mozilla += [ 'PluginPRLibrary.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'nsJSNPRuntime.cpp', + 'nsNPAPIPlugin.cpp', 'nsNPAPIPluginInstance.cpp', 'nsNPAPIPluginStreamListener.cpp', + 'nsPluginHost.cpp', 'nsPluginInstanceOwner.cpp', 'nsPluginModule.cpp', 'nsPluginStreamListenerPeer.cpp', @@ -49,24 +51,19 @@ UNIFIED_SOURCES += [ 'PluginPRLibrary.cpp', ] -SOURCES += [ - 'nsNPAPIPlugin.cpp', # Conflict with X11 headers - 'nsPluginHost.cpp', # Conflict with NS_NPAPIPLUGIN_CALLBACK -] - if CONFIG['OS_ARCH'] == 'WINNT': - UNIFIED_SOURCES += [ + SOURCES += [ 'nsPluginDirServiceProvider.cpp', 'nsPluginNativeWindowWin.cpp', 'nsPluginsDirWin.cpp', ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': - UNIFIED_SOURCES += [ + SOURCES += [ 'nsPluginNativeWindow.cpp', 'nsPluginsDirDarwin.cpp', ] else: - UNIFIED_SOURCES += [ + SOURCES += [ 'nsPluginsDirUnix.cpp', ] if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: @@ -75,7 +72,7 @@ else: 'nsPluginNativeWindowGtk.cpp', ] else: - UNIFIED_SOURCES += [ + SOURCES += [ 'nsPluginNativeWindow.cpp', ] |