These are code changes required to make the GYP build work.

Mostly these are fixes to warnings (signed/unsigned mismatches
were the most common), and some changes to include paths.

I've updated the build.scons files and DEPS file to match these
changes so that the scons build will still function with these
changes.

Review URL: http://codereview.chromium.org/146047

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19062 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 14 insertions, 13 deletions

diff --git a/o3d/plugin/build.scons b/o3d/plugin/build.scons
index e6c344a..666cd7a 100644
--- a/o3d/plugin/build.scons
+++ b/o3d/plugin/build.scons
@@ -82,7 +82,8 @@ env.Append(
         '$NIXYSA_STATIC_GLUE',
         '$SCONSTRUCT_DIR/plugin/win',  # for RES resource.h
         '$WTL_71_DIR/include',
-    ],
+        '$THIRD_PARTY',
+        ],
     LIBPATH = [
         '$NACL_LIB_DIR',
     ],
@@ -180,7 +181,7 @@ AUTOGEN_CC_FILES = [f for f in AUTOGEN_OUTPUT if f.suffix == '.cc']
 
 inputs = AUTOGEN_CC_FILES + [
   'cross/async_loading.cc',
-  'cross/archive_request_glue.cc',
+  'cross/archive_request_static_glue.cc',
   'cross/blacklist.cc',
   'cross/o3d_glue.cc',
   'cross/np_v8_bridge.cc',
diff --git a/o3d/plugin/cross/archive_request_glue.cc b/o3d/plugin/cross/archive_request_static_glue.cc
index 704aaa7..c11fd1c 100644
--- a/o3d/plugin/cross/archive_request_glue.cc
+++ b/o3d/plugin/cross/archive_request_static_glue.cc
@@ -30,7 +30,7 @@
  */
 
 
-#include "plugin/cross/archive_request_glue.h"
+#include "plugin/cross/archive_request_static_glue.h"
 
 #include "base/basictypes.h"
 #include "plugin/cross/stream_manager.h"
diff --git a/o3d/plugin/cross/archive_request_glue.h b/o3d/plugin/cross/archive_request_static_glue.h
index f9f1384..199de08 100644
--- a/o3d/plugin/cross/archive_request_glue.h
+++ b/o3d/plugin/cross/archive_request_static_glue.h
@@ -32,8 +32,8 @@
 
 // This file declares the glue for FileRequest actions.
 
-#ifndef O3D_PLUGIN_ARCHIVE_REQUEST_GLUE_H_
-#define O3D_PLUGIN_ARCHIVE_REQUEST_GLUE_H_
+#ifndef O3D_PLUGIN_ARCHIVE_REQUEST_STATIC_GLUE_H_
+#define O3D_PLUGIN_ARCHIVE_REQUEST_STATIC_GLUE_H_
 
 #include "core/cross/callback.h"
 #include "core/cross/types.h"
@@ -63,4 +63,4 @@ void userglue_method_send(void *plugin_data,
 }  // namespace namespace_o3d
 }  // namespace glue
 
-#endif  // O3D_PLUGIN_ARCHIVE_REQUEST_GLUE_H_
+#endif  // O3D_PLUGIN_ARCHIVE_REQUEST_STATIC_GLUE_H_
diff --git a/o3d/plugin/cross/np_v8_bridge.h b/o3d/plugin/cross/np_v8_bridge.h
index 779a5a3..150a3c2 100644
--- a/o3d/plugin/cross/np_v8_bridge.h
+++ b/o3d/plugin/cross/np_v8_bridge.h
@@ -62,7 +62,7 @@
 #undef Value
 #endif
 
-#include "third_party/v8/include/v8.h"
+#include "v8/include/v8.h"
 
 namespace o3d {
 
diff --git a/o3d/plugin/idl/bounding_box.idl b/o3d/plugin/idl/bounding_box.idl
index b8ac932..1904f59 100644
--- a/o3d/plugin/idl/bounding_box.idl
+++ b/o3d/plugin/idl/bounding_box.idl
@@ -143,7 +143,7 @@ class BoundingBox {
         O3D_ERROR(service_locator)
             << "BoundingBox: expected 2 values, got " << values.size();
       } else {
-        for (int i = 0; i < values.size(); ++i) {
+        for (std::vector<float>::size_type i = 0; i < values.size(); ++i) {
           if (values[i].size() != 3) {
             o3d::ServiceLocator* service_locator =
                 static_cast<glue::_o3d::PluginObject*>(
diff --git a/o3d/plugin/idl/texture.idl b/o3d/plugin/idl/texture.idl
index cc470c0..7039a9e 100644
--- a/o3d/plugin/idl/texture.idl
+++ b/o3d/plugin/idl/texture.idl
@@ -268,7 +268,7 @@ namespace o3d {
         source_x -= destination_x;
         destination_x = 0;
       }
-      if (destination_x + copy_width > texture_width) {
+      if (destination_x + copy_width > static_cast<int>(texture_width)) {
         copy_width -= destination_x + copy_width - texture_width;
       }
 
@@ -277,7 +277,7 @@ namespace o3d {
         source_y -= destination_y;
         destination_y = 0;
       }
-      if (destination_y + copy_height > texture_height) {
+      if (destination_y + copy_height > static_cast<int>(texture_height)) {
         copy_height -= destination_y + copy_height - texture_height;
       }
 
@@ -303,7 +303,7 @@ namespace o3d {
               (destination_y * texture_width + destination_x) * num_components;
           while (copy_height > 0) {
             for (int xx = 0; xx < copy_width; ++xx) {
-              for (int element = 0; element < num_components; ++element) {
+              for (unsigned element = 0; element < num_components; ++element) {
                 destination[element] = Vectormath::Aos::FloatToHalf(
                     source[swizzle[element]]);
               }
@@ -323,7 +323,7 @@ namespace o3d {
             (destination_y * texture_width + destination_x) * num_components;
           while (copy_height > 0) {
             for (int xx = 0; xx < copy_width; ++xx) {
-              for (int element = 0; element < num_components; ++element) {
+              for (unsigned element = 0; element < num_components; ++element) {
                 destination[element] = source[swizzle[element]];
               }
               destination += num_components;
diff --git a/o3d/plugin/win/main_win.cc b/o3d/plugin/win/main_win.cc
index 1f1b14d..6107067 100644
--- a/o3d/plugin/win/main_win.cc
+++ b/o3d/plugin/win/main_win.cc
@@ -442,7 +442,7 @@ static LRESULT HandleDragAndDrop(PluginObject *obj, WPARAM wParam) {
   path_to_use = path.get();
 #endif
 
-  for (int i = 0; i < num_chars; ++i) {
+  for (UINT i = 0; i < num_chars; ++i) {
     if (path_to_use[i] == '\\') {
       path_to_use[i] = '/';
     }