Changes to make command buffers compile. Still failing some unit tests and examples, but wanted to get the compile fixes checked in.

Pulling out the main.scons so as not to affect the build.
Review URL: http://codereview.chromium.org/125169

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

8 files changed, 9 insertions, 8 deletions

diff --git a/o3d/command_buffer/client/cross/big_test_client.cc b/o3d/command_buffer/client/cross/big_test_client.cc
index f829187..cf42ee5 100644
--- a/o3d/command_buffer/client/cross/big_test_client.cc
+++ b/o3d/command_buffer/client/cross/big_test_client.cc
@@ -34,7 +34,7 @@
 #ifdef __native_client__
 #include <sys/nacl_syscalls.h>
 #else
-#include "native_client/service_runtime/nrd_xfer_lib/nrd_all_modules.h"
+#include "third_party/native_client/googleclient/native_client/src/trusted/desc/nrd_all_modules.h"
 #endif
 #include "command_buffer/common/cross/gapi_interface.h"
 #include "command_buffer/common/cross/rpc_imc.h"
diff --git a/o3d/command_buffer/common/cross/rpc.h b/o3d/command_buffer/common/cross/rpc.h
index d2e0d9f..fb55a88 100644
--- a/o3d/command_buffer/common/cross/rpc.h
+++ b/o3d/command_buffer/common/cross/rpc.h
@@ -35,7 +35,7 @@
 
 #include "base/basictypes.h"
 
-#include "native_client/intermodule_comm/nacl_htp.h"
+#include "third_party/native_client/googleclient/native_client/src/shared/imc/nacl_htp.h"
 
 namespace o3d {
 namespace command_buffer {
diff --git a/o3d/command_buffer/common/cross/rpc_imc.cc b/o3d/command_buffer/common/cross/rpc_imc.cc
index 1fcb9c7..5d6c1f7 100644
--- a/o3d/command_buffer/common/cross/rpc_imc.cc
+++ b/o3d/command_buffer/common/cross/rpc_imc.cc
@@ -33,7 +33,7 @@
 #include <algorithm>
 #include "command_buffer/common/cross/logging.h"
 #include "command_buffer/common/cross/rpc_imc.h"
-#include "native_client/intermodule_comm/nacl_htp.h"
+#include "third_party/native_client/googleclient/native_client/src/shared/imc/nacl_htp.h"
 
 namespace o3d {
 namespace command_buffer {
diff --git a/o3d/command_buffer/common/cross/rpc_imc.h b/o3d/command_buffer/common/cross/rpc_imc.h
index 5d2624f..8e4aed4 100644
--- a/o3d/command_buffer/common/cross/rpc_imc.h
+++ b/o3d/command_buffer/common/cross/rpc_imc.h
@@ -33,7 +33,7 @@
 #ifndef O3D_COMMAND_BUFFER_COMMON_CROSS_RPC_IMC_H_
 #define O3D_COMMAND_BUFFER_COMMON_CROSS_RPC_IMC_H_
 
-#include "native_client/intermodule_comm/nacl_imc.h"
+#include "third_party/native_client/googleclient/native_client/src/shared/imc/nacl_imc.h"
 #include "base/scoped_ptr.h"
 #include "command_buffer/common/cross/rpc.h"
 
diff --git a/o3d/command_buffer/common/cross/types.h b/o3d/command_buffer/common/cross/types.h
index add362f..ee97423 100644
--- a/o3d/command_buffer/common/cross/types.h
+++ b/o3d/command_buffer/common/cross/types.h
@@ -35,6 +35,7 @@
 #ifndef O3D_COMMAND_BUFFER_COMMON_CROSS_TYPES_H_
 #define O3D_COMMAND_BUFFER_COMMON_CROSS_TYPES_H_
 
+#include <build/build_config.h>
 #if !defined(COMPILER_MSVC)
 #include <stdint.h>
 #endif
diff --git a/o3d/command_buffer/service/build.scons b/o3d/command_buffer/service/build.scons
index 17ec60f..c8e9292 100644
--- a/o3d/command_buffer/service/build.scons
+++ b/o3d/command_buffer/service/build.scons
@@ -58,7 +58,7 @@ env.Append(
 )
 
 if env['TARGET_PLATFORM'] == 'WINDOWS':
-  env.Append(CCFLAGS = ['/Wp64'],
+  env.Append(CCFLAGS = [],
              LIBS = [# System libs.
                      'd3d9',
                      # TODO: remove link-time dependency on d3dx9, using
diff --git a/o3d/command_buffer/service/cross/big_test.cc b/o3d/command_buffer/service/cross/big_test.cc
index b68a9da..0c92508 100644
--- a/o3d/command_buffer/service/cross/big_test.cc
+++ b/o3d/command_buffer/service/cross/big_test.cc
@@ -42,7 +42,7 @@
 #include "command_buffer/service/cross/buffer_rpc.h"
 #include "command_buffer/service/cross/cmd_buffer_engine.h"
 #include "command_buffer/service/cross/gapi_decoder.h"
-#include "native_client/service_runtime/nrd_xfer_lib/nrd_all_modules.h"
+#include "third_party/native_client/googleclient/native_client/src/trusted/desc/nrd_all_modules.h"
 
 namespace o3d {
 namespace command_buffer {
diff --git a/o3d/command_buffer/service/cross/plugin.cc b/o3d/command_buffer/service/cross/plugin.cc
index 651713d..b85dbbe8 100644
--- a/o3d/command_buffer/service/cross/plugin.cc
+++ b/o3d/command_buffer/service/cross/plugin.cc
@@ -48,8 +48,8 @@
 #ifdef OS_WIN
 #include "command_buffer/service/win/d3d9/gapi_d3d9.h"
 #endif
-#include "native_client/service_runtime/nrd_xfer_lib/nrd_all_modules.h"
-#include "tools/idlglue/ng/static_glue/npapi/npn_api.h"
+#include "third_party/native_client/googleclient/native_client/src/trusted/desc/nrd_all_modules.h"
+#include "third_party/nixysa/files/static_glue/npapi/npn_api.h"
 
 namespace o3d {
 namespace command_buffer {