Commit c63bb51245badba5313db98afa45dd23cce7b7d1
2020-03-20T19:42:59
Only build raw input support on Windows
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46
diff --git a/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj b/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj
old mode 100644
new mode 100755
diff --git a/configure b/configure
index d81855a..f476a88 100755
--- a/configure
+++ b/configure
@@ -24336,8 +24336,6 @@ fi
$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"
@@ -24889,6 +24887,9 @@ $as_echo "#define SDL_JOYSTICK_DINPUT 1" >>confdefs.h
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 4596adc..e9541bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3316,7 +3316,6 @@ AS_HELP_STRING([--enable-hidapi], [use HIDAPI for low level joystick drivers [[d
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"
@@ -3714,6 +3713,7 @@ AS_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
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