summaryrefslogtreecommitdiffstats
path: root/o3d/core/core.gyp
diff options
context:
space:
mode:
authorapatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-11 18:33:08 +0000
committerapatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-11 18:33:08 +0000
commit6e8abf638e8bec81426f651b3e85a258f476f43a (patch)
tree6301f059616590e37d91eaf69bec685044b7fdf0 /o3d/core/core.gyp
parent1c8ba9c3a84724d3116a50cd96431c8bc6d9e848 (diff)
downloadchromium_src-6e8abf638e8bec81426f651b3e85a258f476f43a.zip
chromium_src-6e8abf638e8bec81426f651b3e85a258f476f43a.tar.gz
chromium_src-6e8abf638e8bec81426f651b3e85a258f476f43a.tar.bz2
Reorganized command buffer and GPU plugin code into following structure:
gpu/gpu.gyp gpu/command_buffer/... gpu/gpu_plugin/... gpu/np_utils/... And fixed up paths and header sentry macros. Also merged command_buffer.gyp into gpu.gyp. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31676 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/core/core.gyp')
-rw-r--r--o3d/core/core.gyp8
1 files changed, 4 insertions, 4 deletions
diff --git a/o3d/core/core.gyp b/o3d/core/core.gyp
index cd2a8d9..1f3afa8 100644
--- a/o3d/core/core.gyp
+++ b/o3d/core/core.gyp
@@ -398,8 +398,8 @@
['renderer == "cb"',
{
'dependencies': [
- '../command_buffer/command_buffer.gyp:command_buffer_client',
- '../gpu_plugin/gpu_plugin.gyp:np_utils',
+ '../gpu/gpu.gyp:command_buffer_client',
+ '../gpu/gpu.gyp:np_utils',
],
'sources': [
'cross/command_buffer/buffer_cb.cc',
@@ -430,11 +430,11 @@
['renderer == "cb" and cb_service != "remote"',
{
'dependencies': [
- '../command_buffer/command_buffer.gyp:command_buffer_service',
+ '../gpu/gpu.gyp:command_buffer_service',
# These dependencies are only needed for RendererCBLocal. They can
# be removed when RendererCBLocal is not needed.
- '../gpu_plugin/gpu_plugin.gyp:command_buffer',
+ '../gpu/gpu.gyp:command_buffer',
],
},
],