[Commits] SDL: Fixed mingw-w64 build

libsdl.org revision control commits-owner at libsdl.org
Fri Sep 28 00:40:38 PDT 2018


details:   https://hg.libsdl.org/SDL/rev/63282fe5089e
changeset: 12244:63282fe5089e
user:      Sam Lantinga <slouken at libsdl.org>
date:      Fri Sep 28 00:40:35 2018 -0700
description:
Fixed mingw-w64 build

diffstat:

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

diffs (53 lines):

diff -r a5781d950d5d -r 63282fe5089e configure
--- a/configure	Thu Sep 27 23:54:40 2018 -0700
+++ b/configure	Fri Sep 28 00:40:35 2018 -0700
@@ -24299,6 +24299,13 @@
             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 -r a5781d950d5d -r 63282fe5089e configure.in
--- a/configure.in	Thu Sep 27 23:54:40 2018 -0700
+++ b/configure.in	Fri Sep 28 00:40:35 2018 -0700
@@ -3631,6 +3631,11 @@
             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 -r a5781d950d5d -r 63282fe5089e src/render/direct3d11/SDL_render_d3d11.c
--- a/src/render/direct3d11/SDL_render_d3d11.c	Thu Sep 27 23:54:40 2018 -0700
+++ b/src/render/direct3d11/SDL_render_d3d11.c	Fri Sep 28 00:40:35 2018 -0700
@@ -2223,8 +2223,6 @@
 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 @@
                    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;


More information about the commits mailing list