encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

autotools, cmake: don't define SDL_JOYSTICK_HIDAPI in CheckHIDAPI()

This commit is contained in:
Ozkan Sezer 2021-11-16 23:37:20 +03:00
parent 5cc23868ed
commit 68ffd24c58
3 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/sdlchecks.cmake
View File

@ -1172,8 +1172,6 @@ macro(CheckHIDAPI)
file(GLOB HIDAPI_JOYSTICK_SOURCES ${SDL2_SOURCE_DIR}/src/joystick/hidapi/*.c) file(GLOB HIDAPI_JOYSTICK_SOURCES ${SDL2_SOURCE_DIR}/src/joystick/hidapi/*.c)
set(SOURCE_FILES ${SOURCE_FILES} ${HIDAPI_JOYSTICK_SOURCES}) set(SOURCE_FILES ${SOURCE_FILES} ${HIDAPI_JOYSTICK_SOURCES})
endif() endif()
else()
set(SDL_HIDAPI_DISABLED 1)
endif() endif()
endmacro() endmacro()

10
configure vendored
View File

@ -24777,27 +24777,21 @@ $as_echo "$as_me: WARNING: You must have SDL_LoadObject() support for dynamic li
if test x$libusb_lib = x; then if test x$libusb_lib = x; then
libusb_lib=`find_lib "libusb-1.0.so.*" "" | sed 's/.*\/\(.*\)/\1/; q'` libusb_lib=`find_lib "libusb-1.0.so.*" "" | sed 's/.*\/\(.*\)/\1/; q'`
fi fi
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define SDL_LIBUSB_DYNAMIC "$libusb_lib" #define SDL_LIBUSB_DYNAMIC "$libusb_lib"
_ACEOF _ACEOF
fi fi
fi fi
else
$as_echo "#define SDL_HIDAPI_DISABLED 1" >>confdefs.h
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hidapi support" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hidapi joystick support" >&5
$as_echo_n "checking for hidapi support... " >&6; } $as_echo_n "checking for hidapi joystick support... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hidapi_support" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hidapi_support" >&5
$as_echo "$hidapi_support" >&6; } $as_echo "$hidapi_support" >&6; }
fi fi
if test x$enable_joystick = xyes -a x$hidapi_support = xyes -a x$enable_hidapi_joystick = xyes; then if test x$enable_joystick = xyes -a x$hidapi_support = xyes -a x$enable_hidapi_joystick = xyes; then
$as_echo "#define SDL_JOYSTICK_HIDAPI 1" >>confdefs.h $as_echo "#define SDL_JOYSTICK_HIDAPI 1" >>confdefs.h
SOURCES="$SOURCES $srcdir/src/joystick/hidapi/*.c" SOURCES="$SOURCES $srcdir/src/joystick/hidapi/*.c"

4
configure.ac
View File

@ -3478,11 +3478,9 @@ CheckHIDAPI()
AC_DEFINE_UNQUOTED(SDL_LIBUSB_DYNAMIC, "$libusb_lib", []) AC_DEFINE_UNQUOTED(SDL_LIBUSB_DYNAMIC, "$libusb_lib", [])
fi fi
fi fi
else
AC_DEFINE(SDL_HIDAPI_DISABLED, 1, [ ])
fi fi
AC_MSG_CHECKING(for hidapi support) AC_MSG_CHECKING(for hidapi joystick support)
AC_MSG_RESULT($hidapi_support) AC_MSG_RESULT($hidapi_support)
fi fi