diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-24 01:13:12 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-24 01:13:12 +0000 |
| commit | 8c2b005ffdc22c871638d0cfd356441741247bd5 (patch) | |
| tree | 19aafa4b3663bb05548c1918f3e948a8e61ada48 /o3d/build | |
| parent | df16dd7c01c843479217c472392959e723accd8b (diff) | |
| download | chromium_src-8c2b005ffdc22c871638d0cfd356441741247bd5.zip chromium_src-8c2b005ffdc22c871638d0cfd356441741247bd5.tar.gz chromium_src-8c2b005ffdc22c871638d0cfd356441741247bd5.tar.bz2 | |
Adds in the ActiveX control for O3D.
Review URL: http://codereview.chromium.org/160078
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21492 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/build')
| -rw-r--r-- | o3d/build/all.gyp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/o3d/build/all.gyp b/o3d/build/all.gyp index 8705962..2229b2e3 100644 --- a/o3d/build/all.gyp +++ b/o3d/build/all.gyp @@ -25,13 +25,22 @@ '../import/import.gyp:o3dImport', '../plugin/idl/idl.gyp:o3dPluginIdl', '../plugin/plugin.gyp:add_version', - '../plugin/plugin.gyp:npo3dautoplugin', + '../plugin/plugin.gyp:o3dPlugin', '../plugin/plugin.gyp:o3dPluginLogging', '../serializer/serializer.gyp:o3dSerializer', '../statsreport/statsreport.gyp:o3dStatsReport', '../tests/tests.gyp:unit_tests', '../utils/utils.gyp:o3dUtils', ], + 'conditions': [ + ['OS=="win"', + { + 'dependencies': [ + '../plugin/plugin.gyp:o3dActiveXHost', + ], + }, + ], + ], }, ], } |