Adding cairo and pixman build to windows.

Review URL: http://codereview.chromium.org/6594091

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76584 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 164 insertions, 3 deletions

diff --git a/o3d/build/cairo.gyp b/o3d/build/cairo.gyp
index 433b53e..edeb6e4 100644
--- a/o3d/build/cairo.gyp
+++ b/o3d/build/cairo.gyp
@@ -12,10 +12,10 @@
   'targets': [
     {
       'target_name': 'cairo',
-      'type': 'none',
       'conditions': [
         ['OS == "mac"',
           {
+            'type': 'none',
             'dependencies': [
               'pixman.gyp:pixman',
               'pkg-config.gyp:pkg-config',
@@ -72,6 +72,102 @@
             ],
           },
         ],
+        ['OS == "win"',
+          {
+            'type': 'static_library',
+            'defines': [
+              'CAIRO_WIN32_STATIC_BUILD',
+              # TODO(gangji): This may hurt perf. Investigate.
+              'DISABLE_SOME_FLOATING_POINT',
+            ],
+            'include_dirs': [
+              '../../<(cairodir)/src',
+              '../../<(pngdir)/',
+              '../../<(pixmandir)/pixman',
+              '../../<(zlibdir)/',
+              'misc'
+            ],
+            'sources': [
+              '../../<(cairodir)/src/cairo-analysis-surface.c',
+              '../../<(cairodir)/src/cairo-arc.c',
+              '../../<(cairodir)/src/cairo-array.c',
+              '../../<(cairodir)/src/cairo-atomic.c',
+              '../../<(cairodir)/src/cairo-base64-stream.c',
+              '../../<(cairodir)/src/cairo-base85-stream.c',
+              '../../<(cairodir)/src/cairo-bentley-ottmann.c',
+              '../../<(cairodir)/src/cairo-bentley-ottmann-rectangular.c',
+              '../../<(cairodir)/src/cairo-bentley-ottmann-rectilinear.c',
+              '../../<(cairodir)/src/cairo-botor-scan-converter.c',
+              '../../<(cairodir)/src/cairo-boxes.c',
+              '../../<(cairodir)/src/cairo.c',
+              '../../<(cairodir)/src/cairo-cache.c',
+              '../../<(cairodir)/src/cairo-clip.c',
+              '../../<(cairodir)/src/cairo-color.c',
+              '../../<(cairodir)/src/cairo-composite-rectangles.c',
+              '../../<(cairodir)/src/cairo-debug.c',
+              '../../<(cairodir)/src/cairo-device.c',
+              '../../<(cairodir)/src/cairo-fixed.c',
+              '../../<(cairodir)/src/cairo-font-face.c',
+              '../../<(cairodir)/src/cairo-font-face-twin.c',
+              '../../<(cairodir)/src/cairo-font-face-twin-data.c',
+              '../../<(cairodir)/src/cairo-font-options.c',
+              '../../<(cairodir)/src/cairo-freelist.c',
+              '../../<(cairodir)/src/cairo-freed-pool.c',
+              '../../<(cairodir)/src/cairo-gstate.c',
+              '../../<(cairodir)/src/cairo-hash.c',
+              '../../<(cairodir)/src/cairo-hull.c',
+              '../../<(cairodir)/src/cairo-image-info.c',
+              '../../<(cairodir)/src/cairo-image-surface.c',
+              '../../<(cairodir)/src/cairo-lzw.c',
+              '../../<(cairodir)/src/cairo-matrix.c',
+              '../../<(cairodir)/src/cairo-recording-surface.c',
+              '../../<(cairodir)/src/cairo-misc.c',
+              '../../<(cairodir)/src/cairo-mutex.c',
+              '../../<(cairodir)/src/cairo-observer.c',
+              '../../<(cairodir)/src/cairo-output-stream.c',
+              '../../<(cairodir)/src/cairo-paginated-surface.c',
+              '../../<(cairodir)/src/cairo-path-bounds.c',
+              '../../<(cairodir)/src/cairo-path.c',
+              '../../<(cairodir)/src/cairo-path-fill.c',
+              '../../<(cairodir)/src/cairo-path-fixed.c',
+              '../../<(cairodir)/src/cairo-path-in-fill.c',
+              '../../<(cairodir)/src/cairo-path-stroke.c',
+              '../../<(cairodir)/src/cairo-pattern.c',
+              '../../<(cairodir)/src/cairo-pen.c',
+              '../../<(cairodir)/src/cairo-png.c',
+              '../../<(cairodir)/src/cairo-polygon.c',
+              '../../<(cairodir)/src/cairo-rectangle.c',
+              '../../<(cairodir)/src/cairo-rectangular-scan-converter.c',
+              '../../<(cairodir)/src/cairo-region.c',
+              '../../<(cairodir)/src/cairo-rtree.c',
+              '../../<(cairodir)/src/cairo-scaled-font.c',
+              '../../<(cairodir)/src/cairo-scaled-font-subsets.c',
+              '../../<(cairodir)/src/cairo-slope.c',
+              '../../<(cairodir)/src/cairo-spans.c',
+              '../../<(cairodir)/src/cairo-spline.c',
+              '../../<(cairodir)/src/cairo-stroke-style.c',
+              '../../<(cairodir)/src/cairo-surface.c',
+              '../../<(cairodir)/src/cairo-surface-fallback.c',
+              '../../<(cairodir)/src/cairo-surface-clipper.c',
+              '../../<(cairodir)/src/cairo-surface-offset.c',
+              '../../<(cairodir)/src/cairo-surface-snapshot.c',
+              '../../<(cairodir)/src/cairo-surface-subsurface.c',
+              '../../<(cairodir)/src/cairo-surface-wrapper.c',
+              '../../<(cairodir)/src/cairo-system.c',
+              '../../<(cairodir)/src/cairo-tor-scan-converter.c',
+              '../../<(cairodir)/src/cairo-toy-font-face.c',
+              '../../<(cairodir)/src/cairo-traps.c',
+              '../../<(cairodir)/src/cairo-truetype-subset.c',
+              '../../<(cairodir)/src/cairo-unicode.c',
+              '../../<(cairodir)/src/cairo-user-font.c',
+              '../../<(cairodir)/src/cairo-version.c',
+              '../../<(cairodir)/src/cairo-wideint.c',
+              '../../<(cairodir)/src/cairo-win32-surface.c',
+              '../../<(cairodir)/src/cairo-win32-printing-surface.c',
+              '../../<(cairodir)/src/cairo-win32-font.c',
+            ],
+          },        
+        ],
       ],
     },
   ],
diff --git a/o3d/build/libs.gyp b/o3d/build/libs.gyp
index bdee033..8a3f2f9 100644
--- a/o3d/build/libs.gyp
+++ b/o3d/build/libs.gyp
@@ -40,7 +40,19 @@
         ],
         [ 'OS=="win"',
           {
-            #TODO(fransiskusx): Link to Cairo on Win/Mac as a static library,
+            'all_dependent_settings': {
+              'defines': [
+                'CAIRO_WIN32_STATIC_BUILD'
+              ],
+              'include_dirs': [
+                '../../<(cairodir)/src',
+                '../build/misc'
+              ],
+            },
+            'dependencies': [
+              'cairo.gyp:cairo',
+              'pixman.gyp:pixman',
+            ],
           },
         ],
       ],
diff --git a/o3d/build/misc/cairo-features.h b/o3d/build/misc/cairo-features.h
new file mode 100644
index 0000000..496c28e
--- /dev/null
+++ b/o3d/build/misc/cairo-features.h
@@ -0,0 +1,10 @@
+/* Generated by Makefile.win32.  Do not edit. */
+#ifndef CAIRO_FEATURES_H
+#define CAIRO_FEATURES_H 1
+#define CAIRO_HAS_WIN32_SURFACE 1
+#define CAIRO_HAS_WIN32_FONT 1
+#define CAIRO_HAS_PNG_FUNCTIONS 1
+#define CAIRO_HAS_IMAGE_SURFACE 1
+#define CAIRO_HAS_RECORDING_SURFACE 1
+#define CAIRO_HAS_USER_FONT 1
+#endif
diff --git a/o3d/build/pixman.gyp b/o3d/build/pixman.gyp
index b3a794a..ae4278f 100644
--- a/o3d/build/pixman.gyp
+++ b/o3d/build/pixman.gyp
@@ -12,10 +12,10 @@
   'targets': [
     {
       'target_name': 'pixman',
-      'type': 'none',
       'conditions': [
         ['OS == "mac"',
           {
+            'type': 'none',
             'actions': [
               {
                 'action_name': 'build_pixman',
@@ -49,6 +49,49 @@
             ],
           },
         ],
+        ['OS == "win"',
+          {
+            'type': 'static_library',
+            'defines': [
+              'PACKAGE=pixman',
+              'PACKAGE_VERSION=""',
+              'PACKAGE_BUGREPORT=""',
+              'USE_SSE2',
+              'USE_MMX',
+            ],
+            'include_dirs': [
+              '../../<(pixmandir)/pixman',
+            ],
+            'sources': [
+              '../../<(pixmandir)/pixman/pixman.c',
+              '../../<(pixmandir)/pixman/pixman-access.c',
+              '../../<(pixmandir)/pixman/pixman-access-accessors.c',
+              '../../<(pixmandir)/pixman/pixman-bits-image.c',
+              '../../<(pixmandir)/pixman/pixman-combine32.c',
+              '../../<(pixmandir)/pixman/pixman-combine64.c',
+              '../../<(pixmandir)/pixman/pixman-conical-gradient.c',
+              '../../<(pixmandir)/pixman/pixman-cpu.c',
+              '../../<(pixmandir)/pixman/pixman-edge.c',
+              '../../<(pixmandir)/pixman/pixman-edge-accessors.c',
+              '../../<(pixmandir)/pixman/pixman-fast-path.c',
+              '../../<(pixmandir)/pixman/pixman-general.c',
+              '../../<(pixmandir)/pixman/pixman-gradient-walker.c',
+              '../../<(pixmandir)/pixman/pixman-implementation.c',
+              '../../<(pixmandir)/pixman/pixman-image.c',
+              '../../<(pixmandir)/pixman/pixman-linear-gradient.c',
+              '../../<(pixmandir)/pixman/pixman-matrix.c',
+              '../../<(pixmandir)/pixman/pixman-mmx.c',
+              '../../<(pixmandir)/pixman/pixman-radial-gradient.c',
+              '../../<(pixmandir)/pixman/pixman-region16.c',
+              '../../<(pixmandir)/pixman/pixman-region32.c',
+              '../../<(pixmandir)/pixman/pixman-solid-fill.c',
+              '../../<(pixmandir)/pixman/pixman-sse2.c',
+              '../../<(pixmandir)/pixman/pixman-timer.c',
+              '../../<(pixmandir)/pixman/pixman-trap.c',
+              '../../<(pixmandir)/pixman/pixman-utils.c',
+            ],
+          },
+        ],
       ],
     },
   ],