Fixed mingw-w64 build
authorSam Lantinga <slouken@libsdl.org>
Fri, 28 Sep 2018 00:40:35 -0700
changeset 1224463282fe5089e
parent 12243 a5781d950d5d
child 12245 0c1c3e41a6f2
Fixed mingw-w64 build
configure
configure.in
src/render/direct3d11/SDL_render_d3d11.c
     1.1 --- a/configure	Thu Sep 27 23:54:40 2018 -0700
     1.2 +++ b/configure	Fri Sep 28 00:40:35 2018 -0700
     1.3 @@ -24299,6 +24299,13 @@
     1.4              SOURCES="$SOURCES $srcdir/src/joystick/windows/*.c"
     1.5              have_joystick=yes
     1.6          fi
     1.7 +        if test x$enable_joystick = xyes -a x$enable_hidapi = xyes; then
     1.8 +
     1.9 +$as_echo "#define SDL_JOYSTICK_HIDAPI 1" >>confdefs.h
    1.10 +
    1.11 +            EXTRA_CFLAGS="$EXTRA_CFLAGS -I$srcdir/src/hidapi/hidapi"
    1.12 +            SOURCES="$SOURCES $srcdir/src/joystick/hidapi/*.c"
    1.13 +        fi
    1.14          if test x$enable_haptic = xyes; then
    1.15              if test x$have_dinput = xyes -o x$have_xinput = xyes; then
    1.16                  if test x$have_xinput = xyes; then
     2.1 --- a/configure.in	Thu Sep 27 23:54:40 2018 -0700
     2.2 +++ b/configure.in	Fri Sep 28 00:40:35 2018 -0700
     2.3 @@ -3631,6 +3631,11 @@
     2.4              SOURCES="$SOURCES $srcdir/src/joystick/windows/*.c"
     2.5              have_joystick=yes
     2.6          fi
     2.7 +        if test x$enable_joystick = xyes -a x$enable_hidapi = xyes; then
     2.8 +            AC_DEFINE(SDL_JOYSTICK_HIDAPI, 1, [ ])
     2.9 +            EXTRA_CFLAGS="$EXTRA_CFLAGS -I$srcdir/src/hidapi/hidapi"
    2.10 +            SOURCES="$SOURCES $srcdir/src/joystick/hidapi/*.c"
    2.11 +        fi
    2.12          if test x$enable_haptic = xyes; then
    2.13              if test x$have_dinput = xyes -o x$have_xinput = xyes; then
    2.14                  if test x$have_xinput = xyes; then
     3.1 --- a/src/render/direct3d11/SDL_render_d3d11.c	Thu Sep 27 23:54:40 2018 -0700
     3.2 +++ b/src/render/direct3d11/SDL_render_d3d11.c	Fri Sep 28 00:40:35 2018 -0700
     3.3 @@ -2223,8 +2223,6 @@
     3.4  D3D11_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
     3.5                   const SDL_Rect * srcrect, const SDL_FRect * dstrect)
     3.6  {
     3.7 -    D3D11_RenderData *rendererData = (D3D11_RenderData *) renderer->driverdata;
     3.8 -    D3D11_TextureData *textureData = (D3D11_TextureData *) texture->driverdata;
     3.9      float minu, maxu, minv, maxv;
    3.10      Float4 color;
    3.11      VertexPositionColor vertices[4];
    3.12 @@ -2296,8 +2294,6 @@
    3.13                     const SDL_Rect * srcrect, const SDL_FRect * dstrect,
    3.14                     const double angle, const SDL_FPoint * center, const SDL_RendererFlip flip)
    3.15  {
    3.16 -    D3D11_RenderData *rendererData = (D3D11_RenderData *) renderer->driverdata;
    3.17 -    D3D11_TextureData *textureData = (D3D11_TextureData *) texture->driverdata;
    3.18      float minu, maxu, minv, maxv;
    3.19      Float4 color;
    3.20      Float4X4 modelMatrix;