diff options
Diffstat (limited to 'o3d/import/import.gyp')
| -rw-r--r-- | o3d/import/import.gyp | 15 |
1 files changed, 3 insertions, 12 deletions
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', ], |