diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-10 02:38:10 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-10 02:38:10 +0000 |
| commit | 107d07d9a1a53e2c0459b60a5b73d9b0edda1260 (patch) | |
| tree | d4786bba6ca22ec9049818722492228396b71ec5 /o3d/plugin | |
| parent | 61bdca81134d6819d442e76b2bf6aefa89122e63 (diff) | |
| download | chromium_src-107d07d9a1a53e2c0459b60a5b73d9b0edda1260.zip chromium_src-107d07d9a1a53e2c0459b60a5b73d9b0edda1260.tar.gz chromium_src-107d07d9a1a53e2c0459b60a5b73d9b0edda1260.tar.bz2 | |
Fixed some warnings in bitmap_png.cc
Switched to using the latest nacl and using their gyp files.
Added a copy/rename step so that o3dConverter gets the dll
it needs for other build steps.
BUG=None
TEST=None
TBR=gspencer
Review URL: http://codereview.chromium.org/164238
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22891 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin')
| -rw-r--r-- | o3d/plugin/plugin.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp index abf00b8..e0065ae 100644 --- a/o3d/plugin/plugin.gyp +++ b/o3d/plugin/plugin.gyp @@ -38,7 +38,7 @@ '../import/archive.gyp:o3dArchive', '../serializer/serializer.gyp:o3dSerializer', '../utils/utils.gyp:o3dUtils', - '../build/nacl.gyp:build_nacl', + '../../native_client/src/shared/imc/imc.gyp:google_nacl_imc', 'idl/idl.gyp:o3dPluginIdl', ], 'sources': [ |