summaryrefslogtreecommitdiffstats
path: root/o3d/build
diff options
context:
space:
mode:
authorgangji@google.com <gangji@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 23:00:16 +0000
committergangji@google.com <gangji@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 23:00:16 +0000
commite9bdf5333ff6527d4f3c490ad0582e54ff4ca638 (patch)
tree3bf1cf7cd4088906004de7ce60b2e2e0c6063a08 /o3d/build
parent232a58169700ed7abde79d9858c288eb21409e60 (diff)
downloadchromium_src-e9bdf5333ff6527d4f3c490ad0582e54ff4ca638.zip
chromium_src-e9bdf5333ff6527d4f3c490ad0582e54ff4ca638.tar.gz
chromium_src-e9bdf5333ff6527d4f3c490ad0582e54ff4ca638.tar.bz2
Add O2D rendering with cairo into Windows build.
Review URL: http://codereview.chromium.org/6628015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76986 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/build')
-rw-r--r--o3d/build/common.gypi2
-rw-r--r--o3d/build/libs.gyp2
2 files changed, 2 insertions, 2 deletions
diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi
index 796d493..e8369a8 100644
--- a/o3d/build/common.gypi
+++ b/o3d/build/common.gypi
@@ -43,7 +43,7 @@
'cgdir': 'third_party/cg/files/win',
'renderer%': 'd3d9',
'swiftshaderdir': 'o3d-internal/third_party/swiftshader/files',
- 'support_cairo%' : 0,
+ 'support_cairo%' : 1,
},
],
['OS == "mac"',
diff --git a/o3d/build/libs.gyp b/o3d/build/libs.gyp
index 0f31c25..f398bd7 100644
--- a/o3d/build/libs.gyp
+++ b/o3d/build/libs.gyp
@@ -76,7 +76,7 @@
],
'include_dirs': [
'../../<(cairodir)/src',
- '../build/misc'
+ '../build/misc',
],
},
'dependencies': [