summaryrefslogtreecommitdiff
path: root/layout/base/moz.build
diff options
context:
space:
mode:
Diffstat (limited to 'layout/base/moz.build')
-rw-r--r--layout/base/moz.build11
1 files changed, 8 insertions, 3 deletions
diff --git a/layout/base/moz.build b/layout/base/moz.build
index 86377e9db8..bdc6655706 100644
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -118,7 +118,7 @@ EXPORTS.mozilla += [
'StaticPresData.h',
]
-SOURCES += [
+UNIFIED_SOURCES += [
'AccessibleCaret.cpp',
'AccessibleCaretEventHub.cpp',
'AccessibleCaretManager.cpp',
@@ -150,11 +150,9 @@ SOURCES += [
'nsLayoutDebugger.cpp',
'nsLayoutHistoryState.cpp',
'nsLayoutUtils.cpp',
- 'nsPresArena.cpp',
'nsPresContext.cpp',
'nsPresShell.cpp',
'nsQuoteList.cpp',
- 'nsRefreshDriver.cpp',
'nsStyleChangeList.cpp',
'nsStyleSheetService.cpp',
'PaintTracker.cpp',
@@ -170,6 +168,13 @@ SOURCES += [
'ZoomConstraintsClient.cpp',
]
+# nsPresArena.cpp needs to be built separately because it uses plarena.h.
+# nsRefreshDriver.cpp needs to be built separately because of name clashes in the OS X headers
+SOURCES += [
+ 'nsPresArena.cpp',
+ 'nsRefreshDriver.cpp',
+]
+
if CONFIG['ENABLE_TESTS']:
DIRS += ['gtest']