diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-11 18:33:08 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-11 18:33:08 +0000 |
| commit | 6e8abf638e8bec81426f651b3e85a258f476f43a (patch) | |
| tree | 6301f059616590e37d91eaf69bec685044b7fdf0 /o3d/gpu_plugin/gpu_plugin.gyp | |
| parent | 1c8ba9c3a84724d3116a50cd96431c8bc6d9e848 (diff) | |
| download | chromium_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/gpu_plugin/gpu_plugin.gyp')
| -rw-r--r-- | o3d/gpu_plugin/gpu_plugin.gyp | 162 |
1 files changed, 0 insertions, 162 deletions
diff --git a/o3d/gpu_plugin/gpu_plugin.gyp b/o3d/gpu_plugin/gpu_plugin.gyp deleted file mode 100644 index c604a30..0000000 --- a/o3d/gpu_plugin/gpu_plugin.gyp +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright (c) 2009 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'includes': [ - '../build/common.gypi', - ], - 'targets': [ - { - 'target_name': 'np_utils', - 'type': '<(library)', - 'dependencies': [ - '../../base/base.gyp:base', - '../build/o3d_in_chrome.gyp:o3d_in_chrome', - ], - 'include_dirs': [ - '../..', - '../../third_party/npapi', - ], - 'all_dependent_settings': { - 'include_dirs': [ - '../..', - '../../third_party/npapi', - ], - }, # 'all_dependent_settings' - 'sources': [ - 'np_utils/default_np_object.h', - 'np_utils/dynamic_np_object.cc', - 'np_utils/dynamic_np_object.h', - 'np_utils/np_browser.cc', - 'np_utils/np_browser.h', - 'np_utils/np_browser_mock.h', - 'np_utils/np_browser_stub.cc', - 'np_utils/np_browser_stub.h', - 'np_utils/np_class.h', - 'np_utils/np_dispatcher.cc', - 'np_utils/np_dispatcher.h', - 'np_utils/np_dispatcher_specializations.h', - 'np_utils/np_headers.h', - 'np_utils/np_object_mock.h', - 'np_utils/np_object_pointer.h', - 'np_utils/np_plugin_object.h', - 'np_utils/np_plugin_object_mock.h', - 'np_utils/np_plugin_object_factory.cc', - 'np_utils/np_plugin_object_factory.h', - 'np_utils/np_plugin_object_factory_mock.h', - 'np_utils/np_utils.cc', - 'np_utils/np_utils.h', - 'np_utils/webkit_browser.h', - ], - }, - - # This is a standalone executable until O3D is fully moved over to using - # gyp. At that point these can become part of the regular O3D unit tests. - { - 'target_name': 'np_utils_unittests', - 'type': 'executable', - 'dependencies': [ - 'np_utils', - '../../testing/gmock.gyp:gmock', - '../../testing/gmock.gyp:gmockmain', - '../../testing/gtest.gyp:gtest', - ], - 'include_dirs': [ - '../..', - ], - 'all_dependent_settings': { - 'include_dirs': [ - '../..', - ], - }, # 'all_dependent_settings' - 'sources': [ - 'np_utils/dispatched_np_object_unittest.cc', - 'np_utils/dynamic_np_object_unittest.cc', - 'np_utils/np_class_unittest.cc', - 'np_utils/np_object_pointer_unittest.cc', - 'np_utils/np_utils_unittest.cc', - ], - }, - - # These can eventually be merged back into the gpu_plugin target. There - # separated for now so O3D can statically link against them and use command - # buffers in-process without the GPU plugin. - { - 'target_name': 'command_buffer', - 'type': '<(library)', - 'dependencies': [ - '../../base/base.gyp:base', - '../command_buffer/command_buffer.gyp:command_buffer_service', - 'np_utils', - ], - 'all_dependent_settings': { - 'include_dirs': [ - '../..', - ], - }, # 'all_dependent_settings' - 'sources': [ - 'command_buffer.cc', - 'command_buffer.h', - 'command_buffer_mock.h', - 'gpu_processor.h', - 'gpu_processor.cc', - 'gpu_processor_mock.h', - 'gpu_processor_win.cc', - ], - }, - - { - 'target_name': 'gpu_plugin', - 'type': '<(library)', - 'dependencies': [ - '../../base/base.gyp:base', - 'command_buffer', - 'np_utils', - ], - 'include_dirs': [ - '../..', - ], - 'sources': [ - 'gpu_plugin.cc', - 'gpu_plugin.h', - 'gpu_plugin_object.cc', - 'gpu_plugin_object.h', - 'gpu_plugin_object_win.cc', - 'gpu_plugin_object_factory.cc', - 'gpu_plugin_object_factory.h', - ], - }, - - # This is a standalone executable until O3D is fully moved over to using - # gyp. At that point these can become part of the regular O3D unit tests. - { - 'target_name': 'gpu_plugin_unittests', - 'type': 'executable', - 'dependencies': [ - '../command_buffer/command_buffer.gyp:command_buffer_service', - 'gpu_plugin', - 'np_utils', - '../../testing/gmock.gyp:gmock', - '../../testing/gmock.gyp:gmockmain', - '../../testing/gtest.gyp:gtest', - ], - 'include_dirs': [ - '../..', - ], - 'sources': [ - 'command_buffer_unittest.cc', - 'gpu_plugin_unittest.cc', - 'gpu_plugin_object_unittest.cc', - 'gpu_plugin_object_factory_unittest.cc', - 'gpu_processor_unittest.cc', - ], - }, - ] -} - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: |