diff options
Diffstat (limited to 'layout/generic/moz.build')
| -rw-r--r-- | layout/generic/moz.build | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/layout/generic/moz.build b/layout/generic/moz.build index 199b3c679b..1fb80a4d3b 100644 --- a/layout/generic/moz.build +++ b/layout/generic/moz.build @@ -123,7 +123,7 @@ EXPORTS.mozilla.layout += [ 'FrameChildList.h', ] -SOURCES += [ +UNIFIED_SOURCES += [ 'AsyncScrollBase.cpp', 'BlockReflowInput.cpp', 'CSSAlignUtils.cpp', @@ -157,11 +157,9 @@ SOURCES += [ 'nsIntervalSet.cpp', 'nsLeafFrame.cpp', 'nsLineBox.cpp', - 'nsLineLayout.cpp', 'nsPageContentFrame.cpp', 'nsPageFrame.cpp', 'nsPlaceholderFrame.cpp', - 'nsPluginFrame.cpp', 'nsRubyBaseContainerFrame.cpp', 'nsRubyBaseFrame.cpp', 'nsRubyContentFrame.cpp', @@ -187,6 +185,13 @@ SOURCES += [ 'TextOverflow.cpp', ] +# nsLineLayout.cpp needs to be built separately because it uses plarena.h. +# nsPluginFrame.cpp needs to be built separately because of name clashes in the OS X headers. +SOURCES += [ + 'nsLineLayout.cpp', + 'nsPluginFrame.cpp', +] + include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' |