Bug 940178 - Build cairo in unified mode. r=ehsan
authorBenoit Girard <b56girard@gmail.com>
Tue, 19 Nov 2013 10:55:02 -0500
changeset 156412 970ef8123dc37e21d3ed6f9224f2b82297097d0d
parent 156411 a18969434210ede5e1bb87d20be10812d792a804
child 156413 894551227ac53784f9a0009f9ddca0573c4a7532
push id36400
push userb56girard@gmail.com
push dateTue, 19 Nov 2013 20:03:19 +0000
treeherdermozilla-inbound@894551227ac5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan
bugs940178
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 940178 - Build cairo in unified mode. r=ehsan
gfx/cairo/cairo/src/moz.build
--- a/gfx/cairo/cairo/src/moz.build
+++ b/gfx/cairo/cairo/src/moz.build
@@ -109,24 +109,28 @@ if CONFIG['MOZ_ENABLE_CAIRO_FT']:
         'cairo-ft.h',
     ]
     SOURCES += [
         'cairo-ft-font.c',
         'cairo-type1-subset.c',
     ]
 
 SOURCES += [
+    'cairo-bentley-ottmann-rectangular.c', # redefinition of '_cairo_bo_trap'
+    'cairo-bentley-ottmann-rectilinear.c', # redefinition of '_cairo_bo_trap'
+    'cairo-bentley-ottmann.c', # redefinition of '_cairo_bo_trap'
+    'cairo-surface-wrapper.c', #  redefinition of '_copy_transformed_pattern'
+]
+
+UNIFIED_SOURCES += [
     'cairo-analysis-surface.c',
     'cairo-arc.c',
     'cairo-array.c',
     'cairo-atomic.c',
     'cairo-base64-stream.c',
-    'cairo-bentley-ottmann-rectangular.c',
-    'cairo-bentley-ottmann-rectilinear.c',
-    'cairo-bentley-ottmann.c',
     'cairo-botor-scan-converter.c',
     'cairo-boxes.c',
     'cairo-cache.c',
     'cairo-clip.c',
     'cairo-color.c',
     'cairo-composite-rectangles.c',
     'cairo-debug.c',
     'cairo-device.c',
@@ -168,17 +172,16 @@ SOURCES += [
     'cairo-spans.c',
     'cairo-spline.c',
     'cairo-stroke-style.c',
     'cairo-surface-clipper.c',
     'cairo-surface-fallback.c',
     'cairo-surface-offset.c',
     'cairo-surface-snapshot.c',
     'cairo-surface-subsurface.c',
-    'cairo-surface-wrapper.c',
     'cairo-surface.c',
     'cairo-tee-surface.c',
     'cairo-tor-scan-converter.c',
     'cairo-toy-font-face.c',
     'cairo-traps.c',
     'cairo-unicode.c',
     'cairo-user-font.c',
     'cairo-version.c',