aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-02-04 22:17:13 +0000
committerGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-02-04 22:17:13 +0000
commit71cf3ae872ad6e18757eac3f3de0b09f92733446 (patch)
tree78b1d3608cc6803fd0abe4038a180bae8f4d2e5d
parentae97c065d35cc837dc83979b04df2b5c35de2141 (diff)
Use XQuartz's version of OSMesa rather than Mac SDK's. It is newer and has a fix for a bug that unit tests and GM trigger.
git-svn-id: http://skia.googlecode.com/svn/trunk@7561 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--gyp/gpu.gyp6
1 files changed, 3 insertions, 3 deletions
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 6c599e162a..69e0815c69 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -155,7 +155,7 @@
}],
[ 'skia_mesa and skia_os == "mac"', {
'include_dirs': [
- '$(SDKROOT)/usr/X11/include/',
+ '/opt/X11/include/',
],
}],
[ 'not skia_angle', {
@@ -269,11 +269,11 @@
[ 'skia_mesa and skia_os == "mac"', {
'link_settings': {
'libraries': [
- '$(SDKROOT)/usr/X11/lib/libOSMesa.dylib',
+ '/opt/X11/lib/libOSMesa.dylib',
],
},
'include_dirs': [
- '$(SDKROOT)/usr/X11/include/',
+ '/opt/X11/include/',
],
}],
[ 'not skia_mesa', {