Backed out changeset ca9c225103c4
diff --git a/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj b/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj
old mode 100755
new mode 100644
diff --git a/configure b/configure
index f476a88..d81855a 100755
--- a/configure
+++ b/configure
@@ -24336,6 +24336,8 @@
$as_echo "#define SDL_JOYSTICK_HIDAPI 1" >>confdefs.h
+$as_echo "#define SDL_JOYSTICK_RAWINPUT 1" >>confdefs.h
+
EXTRA_CFLAGS="$EXTRA_CFLAGS -I$srcdir/src/hidapi/hidapi"
SOURCES="$SOURCES $srcdir/src/joystick/hidapi/*.c"
SOURCES="$SOURCES $srcdir/src/hidapi/SDL_hidapi.c"
@@ -24887,9 +24889,6 @@
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldinput8 -ldxguid -ldxerr8"
fi
-
-$as_echo "#define SDL_JOYSTICK_RAWINPUT 1" >>confdefs.h
-
else
$as_echo "#define SDL_JOYSTICK_WINMM 1" >>confdefs.h
diff --git a/configure.ac b/configure.ac
index e9541bb..4596adc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3316,6 +3316,7 @@
if test x$hidapi_support = xyes; then
AC_DEFINE(SDL_JOYSTICK_HIDAPI, 1, [ ])
+ AC_DEFINE(SDL_JOYSTICK_RAWINPUT, 1, [ ])
EXTRA_CFLAGS="$EXTRA_CFLAGS -I$srcdir/src/hidapi/hidapi"
SOURCES="$SOURCES $srcdir/src/joystick/hidapi/*.c"
SOURCES="$SOURCES $srcdir/src/hidapi/SDL_hidapi.c"
@@ -3713,7 +3714,6 @@
AC_DEFINE(SDL_JOYSTICK_DINPUT, 1, [ ])
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldinput8 -ldxguid -ldxerr8"
fi
- AC_DEFINE(SDL_JOYSTICK_RAWINPUT, 1, [ ])
else
AC_DEFINE(SDL_JOYSTICK_WINMM, 1, [ ])
fi
