summaryrefslogtreecommitdiffstats
path: root/webkit/webkit.gyp
diff options
context:
space:
mode:
authorkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-05 23:32:52 +0000
committerkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-05 23:32:52 +0000
commit28469c405f3f5e6573a523d1d5e829eabbfb0f0e (patch)
tree4d48c0d083f4847c76a49ee0e7d378fffbade58d /webkit/webkit.gyp
parent12338015077b13e550ce7c4201f8faf8cd858ca5 (diff)
downloadchromium_src-28469c405f3f5e6573a523d1d5e829eabbfb0f0e.zip
chromium_src-28469c405f3f5e6573a523d1d5e829eabbfb0f0e.tar.gz
chromium_src-28469c405f3f5e6573a523d1d5e829eabbfb0f0e.tar.bz2
Ported Chrome's WebGL implementation to Linux. Required changes to
GLEW's bootstrapping sequence on both X11 and Windows platforms to avoid linking against libGL.so.1 directly due to http://crbug.com/16800 . Made GLEW's inclusion of glu.h optional. Tested on Linux, Mac and Windows. BUG=http://crbug.com/21852 TEST=none (runs existing WebGL tests; more coming) Review URL: http://codereview.chromium.org/258024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28062 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/webkit.gyp')
-rw-r--r--webkit/webkit.gyp1
1 files changed, 1 insertions, 0 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index b1bdfb2..7bf816c 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -282,6 +282,7 @@
],
'defines+': [
'GLEW_STATIC=1',
+ 'GLEW_NO_GLU=1',
],
'conditions': [
['OS=="win"', {