summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-13 21:40:26 +0000
committergspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-13 21:40:26 +0000
commit9cb52500ca39aff089dd21340cd2144bb628e309 (patch)
tree06efe020513a7e81dc8fd641a92c9badd83e58b4
parent060ab04c9c999b72a2c5acbcf370bfb90654cb9a (diff)
downloadchromium_src-9cb52500ca39aff089dd21340cd2144bb628e309.zip
chromium_src-9cb52500ca39aff089dd21340cd2144bb628e309.tar.gz
chromium_src-9cb52500ca39aff089dd21340cd2144bb628e309.tar.bz2
This updates the gyp files to make the gyp build work again after a week of
code changes. Review URL: http://codereview.chromium.org/149572 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20543 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--o3d/core/core.gyp2
-rw-r--r--o3d/core/cross/buffer.h1
-rw-r--r--o3d/import/import.gyp2
3 files changed, 5 insertions, 0 deletions
diff --git a/o3d/core/core.gyp b/o3d/core/core.gyp
index 949b9f5..0a47131 100644
--- a/o3d/core/core.gyp
+++ b/o3d/core/core.gyp
@@ -62,6 +62,8 @@
'cross/clear_buffer.h',
'cross/client.cc',
'cross/client.h',
+ 'cross/client_info.cc',
+ 'cross/client_info.h',
'cross/core_metrics.cc',
'cross/core_metrics.h',
'cross/counter.cc',
diff --git a/o3d/core/cross/buffer.h b/o3d/core/cross/buffer.h
index c85b9da..79f5b1f 100644
--- a/o3d/core/cross/buffer.h
+++ b/o3d/core/cross/buffer.h
@@ -40,6 +40,7 @@
#include "core/cross/field.h"
#include "core/cross/named_object.h"
#include "core/cross/types.h"
+#include "base/scoped_ptr.h"
namespace o3d {
diff --git a/o3d/import/import.gyp b/o3d/import/import.gyp
index 41cd4c4..bdbe989 100644
--- a/o3d/import/import.gyp
+++ b/o3d/import/import.gyp
@@ -36,6 +36,8 @@
'cross/collada.h',
'cross/collada_zip_archive.cc',
'cross/collada_zip_archive.h',
+ 'cross/destination_buffer.cc',
+ 'cross/destination_buffer.h',
'cross/file_output_stream_processor.cc',
'cross/file_output_stream_processor.h',
'cross/gz_compressor.cc',