Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1647)

Unified Diff: gpu/gpu.gyp

Issue 367002: Added Pepper 3D render context that instantiates the GPU plugin.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/service/gpu_processor_win.cc ('k') | gpu/gpu_plugin/gpu_plugin.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/gpu.gyp
===================================================================
--- gpu/gpu.gyp (revision 35153)
+++ gpu/gpu.gyp (working copy)
@@ -85,6 +85,7 @@
],
'sources': [
'command_buffer/common/bitfield_helpers.h',
+ 'command_buffer/common/buffer.h',
'command_buffer/common/cmd_buffer_common.h',
'command_buffer/common/cmd_buffer_common.cc',
'command_buffer/common/command_buffer.h',
@@ -278,7 +279,7 @@
},
{
'target_name': 'gpu_plugin',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'../base/base.gyp:base',
'command_buffer_service',
@@ -312,24 +313,40 @@
],
},
{
- 'target_name': 'gles2_demo',
- 'type': 'executable',
+ 'target_name': 'gles2_demo_lib',
+ 'type': 'static_library',
'dependencies': [
'command_buffer_client',
- 'command_buffer_service',
'gles2_lib',
'gles2_c_lib',
- 'gpu_plugin',
],
'sources': [
- 'command_buffer/client/gles2_demo.cc',
'command_buffer/client/gles2_demo_c.h',
'command_buffer/client/gles2_demo_c.c',
'command_buffer/client/gles2_demo_cc.h',
'command_buffer/client/gles2_demo_cc.cc',
],
},
- ]
+ ],
+ 'conditions': [
+ ['OS == "win"',
+ {
+ 'targets': [
+ {
+ 'target_name': 'gles2_demo',
+ 'type': 'executable',
+ 'dependencies': [
+ 'command_buffer_service',
+ 'gles2_demo_lib',
+ ],
+ 'sources': [
+ 'command_buffer/client/gles2_demo.cc',
+ ],
+ },
+ ],
+ },
+ ],
+ ],
}
# Local Variables:
« no previous file with comments | « gpu/command_buffer/service/gpu_processor_win.cc ('k') | gpu/gpu_plugin/gpu_plugin.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698