diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-28 23:22:28 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-28 23:22:28 +0000 |
| commit | 33dc8fa07256578d33459d4433dbaf613dec62c7 (patch) | |
| tree | dabcf73287957b753b2722c96d9945c60f5eb61b /o3d/gpu_plugin/gpu_plugin.gyp | |
| parent | 7db104022c5d04b22473c8258fabdd6a12301242 (diff) | |
| download | chromium_src-33dc8fa07256578d33459d4433dbaf613dec62c7.zip chromium_src-33dc8fa07256578d33459d4433dbaf613dec62c7.tar.gz chromium_src-33dc8fa07256578d33459d4433dbaf613dec62c7.tar.bz2 | |
Diabolic hackery to work around differing NPAPI headers and definitions between Chromium and O3D.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/242042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27430 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/gpu_plugin/gpu_plugin.gyp')
| -rw-r--r-- | o3d/gpu_plugin/gpu_plugin.gyp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/o3d/gpu_plugin/gpu_plugin.gyp b/o3d/gpu_plugin/gpu_plugin.gyp index 0276ee9..5402197 100644 --- a/o3d/gpu_plugin/gpu_plugin.gyp +++ b/o3d/gpu_plugin/gpu_plugin.gyp @@ -15,8 +15,20 @@ ], 'include_dirs': [ '../..', - '../../third_party/npapi', + + # Chrome NPAPI header dir appears before the O3D one so it takes + # priority. TODO(apatrick): one set of NPAPI headers. + '../../third_party/npapi/bindings', + '../../third_party/npapi/include', ], + 'direct_dependent_settings': { + 'include_dirs': [ + # Chrome NPAPI header dir appears before the O3D one so it takes + # priority. TODO(apatrick): one set of NPAPI headers. + '../../third_party/npapi/bindings', + '../../third_party/npapi/include', + ], + }, # 'direct_dependent_settings' 'sources': [ 'np_utils/default_np_object.h', 'np_utils/dynamic_np_object.cc', @@ -30,6 +42,7 @@ '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', |