From 20dfda44894cb8871fd13c7e2d70b8ef1eb947ca Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Fri, 28 Sep 2018 00:40:35 -0700
Subject: [PATCH] Fixed mingw-w64 build

---
 configure                                | 7 +++++++
 configure.in                             | 5 +++++
 src/render/direct3d11/SDL_render_d3d11.c | 4 ----
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 841fa59898bb8..523c1c6c9b425 100755
--- a/configure
+++ b/configure
@@ -24299,6 +24299,13 @@ $as_echo "#define SDL_JOYSTICK_WINMM 1" >>confdefs.h
             SOURCES="$SOURCES $srcdir/src/joystick/windows/*.c"
             have_joystick=yes
         fi
+        if test x$enable_joystick = xyes -a x$enable_hidapi = xyes; then
+
+$as_echo "#define SDL_JOYSTICK_HIDAPI 1" >>confdefs.h
+
+            EXTRA_CFLAGS="$EXTRA_CFLAGS -I$srcdir/src/hidapi/hidapi"
+            SOURCES="$SOURCES $srcdir/src/joystick/hidapi/*.c"
+        fi
         if test x$enable_haptic = xyes; then
             if test x$have_dinput = xyes -o x$have_xinput = xyes; then
                 if test x$have_xinput = xyes; then
diff --git a/configure.in b/configure.in
index 3adebaba080ec..03e23c81c8ffc 100644
--- a/configure.in
+++ b/configure.in
@@ -3631,6 +3631,11 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
             SOURCES="$SOURCES $srcdir/src/joystick/windows/*.c"
             have_joystick=yes
         fi
+        if test x$enable_joystick = xyes -a x$enable_hidapi = xyes; then
+            AC_DEFINE(SDL_JOYSTICK_HIDAPI, 1, [ ])
+            EXTRA_CFLAGS="$EXTRA_CFLAGS -I$srcdir/src/hidapi/hidapi"
+            SOURCES="$SOURCES $srcdir/src/joystick/hidapi/*.c"
+        fi
         if test x$enable_haptic = xyes; then
             if test x$have_dinput = xyes -o x$have_xinput = xyes; then
                 if test x$have_xinput = xyes; then
diff --git a/src/render/direct3d11/SDL_render_d3d11.c b/src/render/direct3d11/SDL_render_d3d11.c
index 153cee743cbb3..7a370392fa90f 100644
--- a/src/render/direct3d11/SDL_render_d3d11.c
+++ b/src/render/direct3d11/SDL_render_d3d11.c
@@ -2223,8 +2223,6 @@ static int
 D3D11_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
                  const SDL_Rect * srcrect, const SDL_FRect * dstrect)
 {
-    D3D11_RenderData *rendererData = (D3D11_RenderData *) renderer->driverdata;
-    D3D11_TextureData *textureData = (D3D11_TextureData *) texture->driverdata;
     float minu, maxu, minv, maxv;
     Float4 color;
     VertexPositionColor vertices[4];
@@ -2296,8 +2294,6 @@ D3D11_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
                    const SDL_Rect * srcrect, const SDL_FRect * dstrect,
                    const double angle, const SDL_FPoint * center, const SDL_RendererFlip flip)
 {
-    D3D11_RenderData *rendererData = (D3D11_RenderData *) renderer->driverdata;
-    D3D11_TextureData *textureData = (D3D11_TextureData *) texture->driverdata;
     float minu, maxu, minv, maxv;
     Float4 color;
     Float4X4 modelMatrix;