From 2b81f945dfc55945f89be633b004a9ef0b1f5fd6 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 5 Sep 2017 01:03:55 +0200
Subject: [PATCH] Update D3D8 codepaths

---
 Makefile.common                           | 3 +--
 gfx/font_driver.c                         | 3 ++-
 menu/drivers_display/menu_display_d3d.cpp | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 26db41efea..052646ca65 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1237,7 +1237,7 @@ ifeq ($(HAVE_D3D9), 1)
 	HAVE_D3D_COMMON = 1
    DEFINES += -DHAVE_D3D9
    LIBS += -ld3d9 -ld3dx9 -ldxguid
-
+   OBJ  += gfx/drivers_font/d3d_w32_font.o
    ifeq ($(HAVE_CG), 1)
       LIBS += -lcgD3D9
       OBJ  += gfx/drivers_renderchain/d3d9_cg_renderchain.o
@@ -1262,7 +1262,6 @@ ifeq ($(HAVE_D3D_COMMON), 1)
 	DEFINES += -DHAVE_D3D
    OBJ += gfx/drivers/d3d.o \
           gfx/common/d3d_common.o \
-          gfx/drivers_font/d3d_w32_font.o \
           gfx/drivers_context/d3d_ctx.o
 
    ifeq ($(HAVE_MENU_COMMON), 1)
diff --git a/gfx/font_driver.c b/gfx/font_driver.c
index 1d3ed375e4..eb3bdf8375 100644
--- a/gfx/font_driver.c
+++ b/gfx/font_driver.c
@@ -88,9 +88,10 @@ static const font_renderer_t *d3d_font_backends[] = {
    &d3d_xdk1_font,
 #elif defined(_XBOX360)
    &d3d_xbox360_font,
-#elif defined(_WIN32)
+#elif defined(_WIN32) && defined(HAVE_D3D9)
    &d3d_win32_font,
 #endif
+   NULL
 };
 
 static bool d3d_font_init_first(
diff --git a/menu/drivers_display/menu_display_d3d.cpp b/menu/drivers_display/menu_display_d3d.cpp
index 17bbe447b1..d64fd25da6 100644
--- a/menu/drivers_display/menu_display_d3d.cpp
+++ b/menu/drivers_display/menu_display_d3d.cpp
@@ -29,8 +29,10 @@
 #include "../../gfx/drivers/d3d.h"
 #include "../../gfx/common/d3d_common.h"
 
-#ifdef HAVE_D3D9
+#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))))