summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/all.gyp2
-rw-r--r--gpu/demos/demos.gyp2
-rw-r--r--third_party/gles2_book/gles2_book.gyp (renamed from third_party/gles2_book/gles_book_examples.gyp)0
3 files changed, 3 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp
index c1c400f..b6646b7 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -95,12 +95,14 @@
'../chrome/app/locales/locales.gyp:*',
'../courgette/courgette.gyp:*',
'../gears/gears.gyp:*',
+ '../gpu/demos/demos.gyp:*',
'../gpu/gpu.gyp:*',
'../rlz/rlz.gyp:*',
'../sandbox/sandbox.gyp:*',
'../third_party/bsdiff/bsdiff.gyp:*',
'../third_party/bspatch/bspatch.gyp:*',
'../third_party/cld/cld.gyp:*',
+ '../third_party/gles2_book/gles2_book.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.
diff --git a/gpu/demos/demos.gyp b/gpu/demos/demos.gyp
index 83a57f2..e40d5b5 100644
--- a/gpu/demos/demos.gyp
+++ b/gpu/demos/demos.gyp
@@ -28,7 +28,7 @@
'type': 'executable',
'dependencies': [
'app_framework',
- '../../third_party/gles2_book/gles_book_examples.gyp:hello_triangle',
+ '../../third_party/gles2_book/gles2_book.gyp:hello_triangle',
],
'sources': [
'hello_triangle/main.cc',
diff --git a/third_party/gles2_book/gles_book_examples.gyp b/third_party/gles2_book/gles2_book.gyp
index 96a6673..96a6673 100644
--- a/third_party/gles2_book/gles_book_examples.gyp
+++ b/third_party/gles2_book/gles2_book.gyp