From 0db3aec7224a937d81363f2ce1b2e9e2e73a39af Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 2 Oct 2017 19:04:49 +0200 Subject: [PATCH] Convert menu_display_d3d.cpp to C --- griffin/griffin.c | 4 ++++ griffin/griffin_cpp.cpp | 4 ---- .../{menu_display_d3d.cpp => menu_display_d3d.c} | 6 ------ 3 files changed, 4 insertions(+), 10 deletions(-) rename menu/drivers_display/{menu_display_d3d.cpp => menu_display_d3d.c} (98%) diff --git a/griffin/griffin.c b/griffin/griffin.c index 1faa6e2f9b..01fe421780 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -1036,6 +1036,10 @@ MENU #include "../menu/drivers_display/menu_display_null.c" +#if defined(HAVE_D3D) +#include "../menu/drivers_display/menu_display_d3d.c" +#endif + #ifdef HAVE_OPENGL #include "../menu/drivers_display/menu_display_gl.c" #endif diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp index 850fd2367a..1ab47dcf79 100644 --- a/griffin/griffin_cpp.cpp +++ b/griffin/griffin_cpp.cpp @@ -97,10 +97,6 @@ MENU #include "../menu/drivers/xui.cpp" #endif -#if defined(HAVE_D3D) -#include "../menu/drivers_display/menu_display_d3d.cpp" -#endif - /*============================================================ VIDEO CONTEXT ============================================================ */ diff --git a/menu/drivers_display/menu_display_d3d.cpp b/menu/drivers_display/menu_display_d3d.c similarity index 98% rename from menu/drivers_display/menu_display_d3d.cpp rename to menu/drivers_display/menu_display_d3d.c index 2650f7fbd3..cc1525aa82 100644 --- a/menu/drivers_display/menu_display_d3d.cpp +++ b/menu/drivers_display/menu_display_d3d.c @@ -29,12 +29,6 @@ #include "../../gfx/drivers/d3d.h" #include "../../gfx/common/d3d_common.h" -#if defined(HAVE_D3D9) -#include "../../gfx/include/d3d9/d3dx9math.h" -#elif defined(HAVE_D3D8) -#include "../../gfx/include/d3d8/d3dx8math.h" -#endif - #define BYTE_CLAMP(i) (int) ((((i) > 255) ? 255 : (((i) < 0) ? 0 : (i)))) static const float d3d_vertexes[] = {