diff options
author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-15 21:51:41 +0000 |
---|---|---|
committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-15 21:51:41 +0000 |
commit | 973c0eda70048d5d9c6e7a02c14fb25e48a3d218 (patch) | |
tree | 22da99c6dc904d927d0ffb5d7311d7f878d9d84d /o3d/plugin | |
parent | a5a6e25bfb05924c0acb74ee42085b4456608c19 (diff) | |
download | chromium_src-973c0eda70048d5d9c6e7a02c14fb25e48a3d218.zip chromium_src-973c0eda70048d5d9c6e7a02c14fb25e48a3d218.tar.gz chromium_src-973c0eda70048d5d9c6e7a02c14fb25e48a3d218.tar.bz2 |
Made gyp file for command buffer libraries.
Gyp build works on Windows. Mac and linux won't work yet.
Fixed some warnings.
Switched from dxerr.lib to dxerr9.lib.
Implemented a Texture::SetRect case for DXT compressed textures.
Fixed division by zero for zero stride vertex buffers.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/200127
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26271 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin')
-rw-r--r-- | o3d/plugin/plugin.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp index 53c24a2..a5b2ff6 100644 --- a/o3d/plugin/plugin.gyp +++ b/o3d/plugin/plugin.gyp @@ -214,11 +214,11 @@ }, }, ], - ['OS == "win" and renderer == "d3d9"', + ['OS == "win" and (renderer == "d3d9" or renderer == "cb")', { 'link_settings': { 'libraries': [ - '"$(DXSDK_DIR)/Lib/x86/DxErr9.lib"', + '"$(DXSDK_DIR)/Lib/x86/DxErr.lib"', '"$(DXSDK_DIR)/Lib/x86/d3dx9.lib"', '-ld3d9.lib', ], |