diff options
Diffstat (limited to 'o3d/core/core.gyp')
-rw-r--r-- | o3d/core/core.gyp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/o3d/core/core.gyp b/o3d/core/core.gyp index e4bc0f4..9216f36 100644 --- a/o3d/core/core.gyp +++ b/o3d/core/core.gyp @@ -318,8 +318,6 @@ 'type': 'static_library', 'dependencies': [ '../../skia/skia.gyp:skia', - '../command_buffer/command_buffer.gyp:command_buffer_client', - '../command_buffer/command_buffer.gyp:command_buffer_service', ], 'sources': [ ], @@ -396,6 +394,16 @@ ], ['renderer == "cb"', { + 'dependencies': [ + '../command_buffer/command_buffer.gyp:command_buffer_client', + '../command_buffer/command_buffer.gyp:command_buffer_service', + '../gpu_plugin/gpu_plugin.gyp:np_utils', + + # These dependencies is only needed for RendererCBLocal. They can + # be removed when RendererCBLocal is not needed. + '../gpu_plugin/gpu_plugin.gyp:command_buffer', + '../gpu_plugin/gpu_plugin.gyp:np_utils', + ], 'sources': [ 'cross/command_buffer/buffer_cb.cc', 'cross/command_buffer/buffer_cb.h', @@ -422,14 +430,6 @@ ], }, ], - ['renderer == "cb" and OS == "win"', - { - 'sources': [ - 'win/command_buffer/win32_cb_server.cc', - 'win/command_buffer/win32_cb_server.h', - ], - }, - ], ], }, { |