summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authoralokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-06 20:32:57 +0000
committeralokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-06 20:32:57 +0000
commit1dcd5e8c3061bcd016dd99a04b939ba23e60497f (patch)
tree03feb6727eb8ff36802c3d4b104b5fac42ef410a /build
parent2d4d7d554ca674fe43159ff777d6f8f048cec44a (diff)
downloadchromium_src-1dcd5e8c3061bcd016dd99a04b939ba23e60497f.zip
chromium_src-1dcd5e8c3061bcd016dd99a04b939ba23e60497f.tar.gz
chromium_src-1dcd5e8c3061bcd016dd99a04b939ba23e60497f.tar.bz2
Resubmit 35500: Added an application framework for demos. Ported hellotriangle example in OpenGL ES book to use the application framework.
BUG=26099 TEST=Try running hello_triangle executable, you should see a red triangle. Review URL: http://codereview.chromium.org/525070 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35647 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/all.gyp2
1 files changed, 2 insertions, 0 deletions
diff --git a/build/all.gyp b/build/all.gyp
index a24ab0f..70d3036 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -96,11 +96,13 @@
'../courgette/courgette.gyp:*',
'../gears/gears.gyp:*',
'../gpu/gpu.gyp:*',
+ '../gpu/demos/demos.gyp:*',
'../rlz/rlz.gyp:*',
'../sandbox/sandbox.gyp:*',
'../third_party/bsdiff/bsdiff.gyp:*',
'../third_party/bspatch/bspatch.gyp:*',
'../third_party/cld/cld.gyp:*',
+ '../third_party/gles_book_examples/gles_book_examples.gyp:*',
'../tools/memory_watcher/memory_watcher.gyp:*',
# As of now Skia build has problems with Linux and/or 64 bits.
# TODO(sehr,brettw): Make this unconditional.