summaryrefslogtreecommitdiffstats
path: root/o3d/import
diff options
context:
space:
mode:
Diffstat (limited to 'o3d/import')
-rw-r--r--o3d/import/cross/precompile.h7
-rw-r--r--o3d/import/import.gyp15
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',
],