configure.in
changeset 12245 0c1c3e41a6f2
parent 12244 63282fe5089e
child 12248 a65c2e471570
     1.1 --- a/configure.in	Fri Sep 28 00:40:35 2018 -0700
     1.2 +++ b/configure.in	Fri Sep 28 01:00:47 2018 -0700
     1.3 @@ -3628,14 +3628,13 @@
     1.4              else
     1.5                  AC_DEFINE(SDL_JOYSTICK_WINMM, 1, [ ])
     1.6              fi
     1.7 +            AC_DEFINE(SDL_JOYSTICK_HIDAPI, 1, [ ])
     1.8              SOURCES="$SOURCES $srcdir/src/joystick/windows/*.c"
     1.9 +            SOURCES="$SOURCES $srcdir/src/joystick/hidapi/*.c"
    1.10 +            SOURCES="$SOURCES $srcdir/src/hidapi/windows/hid.c"
    1.11 +            EXTRA_CFLAGS="$EXTRA_CFLAGS -I$srcdir/src/hidapi/hidapi"
    1.12              have_joystick=yes
    1.13          fi
    1.14 -        if test x$enable_joystick = xyes -a x$enable_hidapi = xyes; then
    1.15 -            AC_DEFINE(SDL_JOYSTICK_HIDAPI, 1, [ ])
    1.16 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -I$srcdir/src/hidapi/hidapi"
    1.17 -            SOURCES="$SOURCES $srcdir/src/joystick/hidapi/*.c"
    1.18 -        fi
    1.19          if test x$enable_haptic = xyes; then
    1.20              if test x$have_dinput = xyes -o x$have_xinput = xyes; then
    1.21                  if test x$have_xinput = xyes; then
    1.22 @@ -3683,7 +3682,7 @@
    1.23          else
    1.24              LIBUUID=-luuid
    1.25          fi
    1.26 -        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion $LIBUUID -static-libgcc"
    1.27 +        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion $LIBUUID -static-libgcc"
    1.28          # The Windows platform requires special setup
    1.29          VERSION_SOURCES="$srcdir/src/main/windows/*.rc"
    1.30          SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c"