diff options
| author | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-28 20:58:52 +0000 |
|---|---|---|
| committer | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-28 20:58:52 +0000 |
| commit | 50e8299eb26f3a289c35badb7e740eb109981cd1 (patch) | |
| tree | bf281eb3aee39a02f0b28bb1c8b8e2bff59bd2ad /webkit/webkit.gyp | |
| parent | 3676406485fd9d45aad8f9ed52b390c0c093b684 (diff) | |
| download | chromium_src-50e8299eb26f3a289c35badb7e740eb109981cd1.zip chromium_src-50e8299eb26f3a289c35badb7e740eb109981cd1.tar.gz chromium_src-50e8299eb26f3a289c35badb7e740eb109981cd1.tar.bz2 | |
Incorporated initial WebGL implementation for Chrome, currently
disabled in the build. Change ENABLE_3D_CANVAS to 1 in
src/third_party/WebKit/WebKit/chromium/features.gypi and regenerate
project files to compile. Current code is Windows-specific and
requires the sandbox to be disabled. Follow-on work will add ports to
other platforms and eventually work with the sandbox enabled.
This CL follows https://bugs.webkit.org/show_bug.cgi?id=29664 .
BUG=http://code.google.com/p/chromium/issues/detail?id=21852
TEST=none (runs preexisting WebGL layout tests; more coming)
Review URL: http://codereview.chromium.org/219001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27404 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/webkit.gyp')
| -rw-r--r-- | webkit/webkit.gyp | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 81778ba..2597199 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -4,6 +4,7 @@ { 'includes': [ + '../third_party/WebKit/WebKit/chromium/features.gypi', '../third_party/WebKit/WebCore/WebCore.gypi', ], 'variables': { @@ -237,6 +238,28 @@ }, { # else: OS!="win" 'sources/': [['exclude', '/win/']], }], + ['"ENABLE_3D_CANVAS=1" in feature_defines', { + # Conditionally compile in GLEW and our GraphicsContext3D implementation. + 'sources+': [ + 'api/src/GraphicsContext3D.cpp', + '../third_party/glew/src/glew.c' + ], + 'include_dirs+': [ + '../third_party/glew/include' + ], + 'defines+': [ + 'GLEW_STATIC=1', + ], + 'conditions': [ + ['OS=="win"', { + 'link_settings': { + 'libraries': [ + '-lopengl32.lib', + ] + }, + }], + ], + }], ], }, { |