From c63bb51245badba5313db98afa45dd23cce7b7d1 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Fri, 20 Mar 2020 19:42:59 -0700 Subject: [PATCH] Only build raw input support on Windows --- Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj | 0 configure | 5 +++-- configure.ac | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) mode change 100644 => 100755 Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj 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 d81855a0a..f476a88a0 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 4596adc6b..e9541bb28 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