diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-30 23:52:04 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-30 23:52:04 +0000 |
| commit | b868366d9fa4b4372db9bef4eb051cba14d25894 (patch) | |
| tree | e2a4ea743bd4fe45a5ada203a040eb88bd9edfa8 /o3d/plugin/plugin.gyp | |
| parent | 92f6b46fbf2bf91fb59a4a74981eb3d6b3a27e97 (diff) | |
| download | chromium_src-b868366d9fa4b4372db9bef4eb051cba14d25894.zip chromium_src-b868366d9fa4b4372db9bef4eb051cba14d25894.tar.gz chromium_src-b868366d9fa4b4372db9bef4eb051cba14d25894.tar.bz2 | |
This adds the sample conversion to the GYP build, at least on Windows.
It also fixes some small problems with the build (naming of plugin DLL and
activex host dll)
Review URL: http://codereview.chromium.org/160428
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22122 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin/plugin.gyp')
| -rw-r--r-- | o3d/plugin/plugin.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp index 8891709..22a881e 100644 --- a/o3d/plugin/plugin.gyp +++ b/o3d/plugin/plugin.gyp @@ -24,7 +24,7 @@ }, 'targets': [ { - 'target_name': 'o3dPlugin', + 'target_name': 'npo3dautoplugin', 'type': '<(o3d_main_lib_type)', 'dependencies': [ '../../<(jpegdir)/libjpeg.gyp:libjpeg', @@ -217,7 +217,7 @@ { 'targets': [ { - 'target_name': 'o3dActiveXHost', + 'target_name': 'o3d_host', 'type': 'shared_library', 'include_dirs': [ '<(INTERMEDIATE_DIR)', |