diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-23 19:07:32 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-23 19:07:32 +0000 |
| commit | 8b8a8fd0d47835f8f90cd4d568a1697d1f8dec25 (patch) | |
| tree | f0b0a823033c805c1090997b82f806f028c8d94e /o3d/import | |
| parent | 6513feea8262f7daa26132681c93e4229aa1d357 (diff) | |
| download | chromium_src-8b8a8fd0d47835f8f90cd4d568a1697d1f8dec25.zip chromium_src-8b8a8fd0d47835f8f90cd4d568a1697d1f8dec25.tar.gz chromium_src-8b8a8fd0d47835f8f90cd4d568a1697d1f8dec25.tar.bz2 | |
This updates the DEPS to bring them in line with the versions
that Chrome is currently using, and it removes "files" from the NPAPI
include paths and file location in third_party so that we can be consistent
with other Chrome third party directories.
TEST=build using gyp and scons and ran unit tests on each.
Review URL: http://codereview.chromium.org/159277
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21415 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/import')
| -rw-r--r-- | o3d/import/archive.gyp | 15 | ||||
| -rw-r--r-- | o3d/import/import.gyp | 13 |
2 files changed, 27 insertions, 1 deletions
diff --git a/o3d/import/archive.gyp b/o3d/import/archive.gyp index 8214cfc..73e12fb 100644 --- a/o3d/import/archive.gyp +++ b/o3d/import/archive.gyp @@ -63,6 +63,21 @@ 'cross/targz_processor_test.cc', ], }, + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)/archive_files', + 'files': [ + "../tests/archive_files/BumpReflect.fx", + "../tests/archive_files/bogus.tar.gz", + "../tests/archive_files/keyboard.jpg", + "../tests/archive_files/keyboard.jpg.gz", + "../tests/archive_files/perc.aif", + "../tests/archive_files/test1.tar", + "../tests/archive_files/test1.tar.gz", + "../tests/archive_files/test2.tar.gz", + ], + }, + ], }, ], } diff --git a/o3d/import/import.gyp b/o3d/import/import.gyp index 2195700..6b716b2 100644 --- a/o3d/import/import.gyp +++ b/o3d/import/import.gyp @@ -28,7 +28,7 @@ '../../<(jpegdir)/libjpeg.gyp:libjpeg', '../../<(pngdir)/libpng.gyp:libpng', '../../<(zlibdir)/zlib.gyp:zlib', - '../compiler/technique/technique.gyp:technique', + '../compiler/technique/technique.gyp:o3dTechnique', ], 'sources': [ 'cross/collada_conditioner.cc', @@ -94,6 +94,17 @@ 'cross/targz_generator_test.cc', ], }, + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)/unittest_data', + 'files': [ + 'test_data/crate.dae', + 'test_data/crate.jpg', + 'test_data/rock01.tga', + 'test_data/rock02.tga', + ], + }, + ], }, ], } |