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/plugins/base/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/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', ] |