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

Unified Diff: import/import.gyp

Issue 208037: Added command buffer unit tests to gyp.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
Patch Set: '' Created 11 years, 3 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « import/cross/precompile.h ('k') | plugin/plugin.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: import/import.gyp
===================================================================
--- import/import.gyp (revision 26702)
+++ import/import.gyp (working copy)
@@ -14,6 +14,7 @@
'..',
'../..',
'../../<(cgdir)/include',
+ '../../<(glewdir)/include',
'../../<(gtestdir)',
],
},
@@ -28,6 +29,7 @@
'../../<(jpegdir)/libjpeg.gyp:libjpeg',
'../../<(pngdir)/libpng.gyp:libpng',
'../../<(zlibdir)/zlib.gyp:zlib',
+ '../build/libs.gyp:cg_libs',
'../compiler/technique/technique.gyp:o3dTechnique',
],
'sources': [
@@ -49,22 +51,11 @@
],
'conditions' : [
- ['renderer == "gl"',
+ ['OS == "win"',
{
- 'dependencies': [
- '../build/libs.gyp:cg_libs',
- ],
- },
- ],
- ['renderer == "d3d9" and OS == "win"',
- {
'include_dirs': [
'$(DXSDK_DIR)/Include',
],
- }
- ],
- ['OS == "win"',
- {
'sources': [
'win/collada_conditioner_win.cc',
],
« no previous file with comments | « import/cross/precompile.h ('k') | plugin/plugin.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698