diff options
| author | rlp@google.com <rlp@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-17 00:33:29 +0000 |
|---|---|---|
| committer | rlp@google.com <rlp@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-17 00:33:29 +0000 |
| commit | a7c9a1aa1e81d8fb3634ca9f88d25e142b1d1d43 (patch) | |
| tree | cd3c029939c98a6808fbbee9785ca3fde41ccd96 /o3d/command_buffer/service | |
| parent | 212ea326e8afca40eb8280b4061e2dce893aaed8 (diff) | |
| download | chromium_src-a7c9a1aa1e81d8fb3634ca9f88d25e142b1d1d43.zip chromium_src-a7c9a1aa1e81d8fb3634ca9f88d25e142b1d1d43.tar.gz chromium_src-a7c9a1aa1e81d8fb3634ca9f88d25e142b1d1d43.tar.bz2 | |
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
Diffstat (limited to 'o3d/command_buffer/service')
| -rw-r--r-- | o3d/command_buffer/service/build.scons | 2 | ||||
| -rw-r--r-- | o3d/command_buffer/service/cross/big_test.cc | 2 | ||||
| -rw-r--r-- | o3d/command_buffer/service/cross/plugin.cc | 4 |
3 files changed, 4 insertions, 4 deletions
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 { |