diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-24 21:35:57 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-24 21:35:57 +0000 |
| commit | b500fc1b519ab243ad1ae31f64c3fe3bca1dc08f (patch) | |
| tree | 222e16c8b8847ceb2f7169b8c899a16a7e9e3d38 /o3d/import | |
| parent | 506cb1db9a466aad6b8d3fdce9cb94eb54516e47 (diff) | |
| download | chromium_src-b500fc1b519ab243ad1ae31f64c3fe3bca1dc08f.zip chromium_src-b500fc1b519ab243ad1ae31f64c3fe3bca1dc08f.tar.gz chromium_src-b500fc1b519ab243ad1ae31f64c3fe3bca1dc08f.tar.bz2 | |
Added command buffer unit tests to gyp.
Can optionally override default renderer with environment variable. One of:
GYP_DEFINES = "renderer=d3d9"
GYP_DEFINES = "renderer=gl"
GYP_DEFINES = "renderer=cb cb_service=d3d9"
GYP_DEFINES = "renderer=cb cb_service=gl"
Fixed some warnings.
Works on windows with D3D9 but not GL, mac or linux yet.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/208037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27125 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/import')
| -rw-r--r-- | o3d/import/cross/precompile.h | 7 | ||||
| -rw-r--r-- | o3d/import/import.gyp | 15 |
2 files changed, 8 insertions, 14 deletions
diff --git a/o3d/import/cross/precompile.h b/o3d/import/cross/precompile.h index 20671d6..c858aa4 100644 --- a/o3d/import/cross/precompile.h +++ b/o3d/import/cross/precompile.h @@ -37,17 +37,20 @@ #include <windows.h> #include <shellapi.h> #include <stdlib.h> -#include <d3dx9.h> #endif #ifdef __cplusplus +#if defined(RENDERER_D3D9) +#include <d3dx9.h> +#endif // defined(RENDERER_D3D9) + #if defined(RENDERER_GL) #include <GL/glew.h> #if defined(OS_WIN) #include <GL/wglew.h> #endif -#endif // defined(RENDERER_GL) +#endif // defined(RENDERER_GL) #include <Cg/cg.h> #include <Cg/cgGL.h> diff --git a/o3d/import/import.gyp b/o3d/import/import.gyp index 3dc94b3..4d5f31d 100644 --- a/o3d/import/import.gyp +++ b/o3d/import/import.gyp @@ -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"', - { - 'dependencies': [ - '../build/libs.gyp:cg_libs', - ], - }, - ], - ['renderer == "d3d9" and OS == "win"', + ['OS == "win"', { 'include_dirs': [ '$(DXSDK_DIR)/Include', ], - } - ], - ['OS == "win"', - { 'sources': [ 'win/collada_conditioner_win.cc', ], |