Backed out changeset ca9c225103c4
authorSam Lantinga <slouken@libsdl.org>
Fri, 20 Mar 2020 19:48:26 -0700
changeset 136537393d75c764e
parent 13652 3797974f4ccf
child 13654 b51e7317fdfc
Backed out changeset ca9c225103c4
Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj
configure
configure.ac
     2.1 --- a/configure	Fri Mar 20 19:47:46 2020 -0700
     2.2 +++ b/configure	Fri Mar 20 19:48:26 2020 -0700
     2.3 @@ -24336,6 +24336,8 @@
     2.4  
     2.5  $as_echo "#define SDL_JOYSTICK_HIDAPI 1" >>confdefs.h
     2.6  
     2.7 +$as_echo "#define SDL_JOYSTICK_RAWINPUT 1" >>confdefs.h
     2.8 +
     2.9              EXTRA_CFLAGS="$EXTRA_CFLAGS -I$srcdir/src/hidapi/hidapi"
    2.10              SOURCES="$SOURCES $srcdir/src/joystick/hidapi/*.c"
    2.11              SOURCES="$SOURCES $srcdir/src/hidapi/SDL_hidapi.c"
    2.12 @@ -24887,9 +24889,6 @@
    2.13  
    2.14                      EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldinput8 -ldxguid -ldxerr8"
    2.15                  fi
    2.16 -
    2.17 -$as_echo "#define SDL_JOYSTICK_RAWINPUT 1" >>confdefs.h
    2.18 -
    2.19              else
    2.20  
    2.21  $as_echo "#define SDL_JOYSTICK_WINMM 1" >>confdefs.h
     3.1 --- a/configure.ac	Fri Mar 20 19:47:46 2020 -0700
     3.2 +++ b/configure.ac	Fri Mar 20 19:48:26 2020 -0700
     3.3 @@ -3316,6 +3316,7 @@
     3.4  
     3.5          if test x$hidapi_support = xyes; then
     3.6              AC_DEFINE(SDL_JOYSTICK_HIDAPI, 1, [ ])
     3.7 +            AC_DEFINE(SDL_JOYSTICK_RAWINPUT, 1, [ ])
     3.8              EXTRA_CFLAGS="$EXTRA_CFLAGS -I$srcdir/src/hidapi/hidapi"
     3.9              SOURCES="$SOURCES $srcdir/src/joystick/hidapi/*.c"
    3.10              SOURCES="$SOURCES $srcdir/src/hidapi/SDL_hidapi.c"
    3.11 @@ -3713,7 +3714,6 @@
    3.12                      AC_DEFINE(SDL_JOYSTICK_DINPUT, 1, [ ])
    3.13                      EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldinput8 -ldxguid -ldxerr8"
    3.14                  fi
    3.15 -                AC_DEFINE(SDL_JOYSTICK_RAWINPUT, 1, [ ])
    3.16              else
    3.17                  AC_DEFINE(SDL_JOYSTICK_WINMM, 1, [ ])
    3.18              fi