From 493b6850a5f7362f24a68315ffd3ab8fd53b7364 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Sat, 23 Apr 2016 18:19:35 +0200 Subject: [PATCH] Use include dir d3d/cg files --- defines/d3d_defines.h | 3 +-- gfx/d3d/render_chain_cg.cpp | 4 ++-- gfx/drivers_shader/shader_gl_cg.c | 4 ++-- gfx/include/Cg/cgD3D9.h | 2 +- gfx/include/Cg/cgGL.h | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/defines/d3d_defines.h b/defines/d3d_defines.h index 8dfabea4a7..5743a642db 100644 --- a/defines/d3d_defines.h +++ b/defines/d3d_defines.h @@ -20,8 +20,7 @@ #if defined(HAVE_D3D9) /* Direct3D 9 */ #include -#include -#include +#include "../gfx/include/d3d9/d3dx9core.h" #define LPDIRECT3D LPDIRECT3D9 #define LPDIRECT3DDEVICE LPDIRECT3DDEVICE9 diff --git a/gfx/d3d/render_chain_cg.cpp b/gfx/d3d/render_chain_cg.cpp index cf57538fc5..ccfdfafc1e 100644 --- a/gfx/d3d/render_chain_cg.cpp +++ b/gfx/d3d/render_chain_cg.cpp @@ -20,8 +20,8 @@ #include #include -#include -#include +#include "../include/Cg/cg.h" +#include "../include/Cg/cgD3D9.h" #include #include diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c index 0bcc721a96..69dbec96a1 100644 --- a/gfx/drivers_shader/shader_gl_cg.c +++ b/gfx/drivers_shader/shader_gl_cg.c @@ -22,10 +22,10 @@ #include #include -#include +#include "../include/Cg/cg.h" #ifdef HAVE_OPENGL #include "../common/gl_common.h" -#include +#include "../include/Cg/cgGL.h" #endif #include diff --git a/gfx/include/Cg/cgD3D9.h b/gfx/include/Cg/cgD3D9.h index f2f64c8d17..59b61b83e5 100644 --- a/gfx/include/Cg/cgD3D9.h +++ b/gfx/include/Cg/cgD3D9.h @@ -59,7 +59,7 @@ #include "cg.h" #include -#include +#include "../d3d9/d3dx9.h" #include /* Set up for either Win32 import/export/lib. */ diff --git a/gfx/include/Cg/cgGL.h b/gfx/include/Cg/cgGL.h index 07d1f93fd3..01e7af8a4c 100644 --- a/gfx/include/Cg/cgGL.h +++ b/gfx/include/Cg/cgGL.h @@ -56,7 +56,7 @@ /*** CGGL Run-Time Library API ***/ /*************************************************************************/ -#include +#include "cg.h" #ifdef _WIN32 # ifndef APIENTRY /* From Win32's */