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