Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(335)

Side by Side Diff: gpu_plugin/gpu_plugin.gyp

Issue 360018: Removed command_buffer dependency on vectormath (indirectly via core/types.h)... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
Patch Set: Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « command_buffer/service/cross/resource.h ('k') | gpu_plugin/np_utils/np_browser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'includes': [ 6 'includes': [
7 '../build/common.gypi', 7 '../build/common.gypi',
8 ], 8 ],
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 '../../testing/gmock.gyp:gmock', 180 '../../testing/gmock.gyp:gmock',
181 '../../testing/gmock.gyp:gmockmain', 181 '../../testing/gmock.gyp:gmockmain',
182 '../../testing/gtest.gyp:gtest', 182 '../../testing/gtest.gyp:gtest',
183 ], 183 ],
184 'include_dirs': [ 184 'include_dirs': [
185 '../..', 185 '../..',
186 ], 186 ],
187 'conditions': [ 187 'conditions': [
188 ['OS == "win" and (renderer == "d3d9" or renderer == "cb")', 188 ['OS == "win" and (renderer == "d3d9" or renderer == "cb")',
189 { 189 {
190 # These dependencies are temporary until the command buffer code
191 # loads D3D and D3DX dynamically.
192 'link_settings': { 190 'link_settings': {
193 'libraries': [ 191 'libraries': [
194 '"$(DXSDK_DIR)/Lib/x86/DxErr.lib"', 192 '"$(DXSDK_DIR)/Lib/x86/DxErr.lib"',
195 '"$(DXSDK_DIR)/Lib/x86/d3dx9.lib"',
196 '-ld3d9.lib',
197 ], 193 ],
198 }, 194 },
199 }, 195 },
200 ], 196 ],
201 ], 197 ],
202 'sources': [ 198 'sources': [
203 'command_buffer_unittest.cc', 199 'command_buffer_unittest.cc',
204 'gpu_plugin_unittest.cc', 200 'gpu_plugin_unittest.cc',
205 'gpu_plugin_object_unittest.cc', 201 'gpu_plugin_object_unittest.cc',
206 'gpu_plugin_object_factory_unittest.cc', 202 'gpu_plugin_object_factory_unittest.cc',
207 'gpu_processor_unittest.cc', 203 'gpu_processor_unittest.cc',
208 ], 204 ],
209 }, 205 },
210 ] 206 ]
211 } 207 }
212 208
213 # Local Variables: 209 # Local Variables:
214 # tab-width:2 210 # tab-width:2
215 # indent-tabs-mode:nil 211 # indent-tabs-mode:nil
216 # End: 212 # End:
217 # vim: set expandtab tabstop=2 shiftwidth=2: 213 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « command_buffer/service/cross/resource.h ('k') | gpu_plugin/np_utils/np_browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698