From dd5987e80a31f888e0b69ce2cc81e08afb73f249 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 22 Dec 2019 13:42:20 -0800 Subject: [PATCH] Fixed bug 4911 - Build broken when hidapi enabled meyraud705 SDL_hidapi.c is added twice to 'SOURCES' which causes "multiple definition error" when linking. --- configure | 4 +--- configure.ac | 3 --- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/configure b/configure index 6952795c0..93cd3aab3 100755 --- a/configure +++ b/configure @@ -24332,6 +24332,7 @@ $as_echo "#define SDL_JOYSTICK_HIDAPI 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" if test x$have_libusb_h = xyes; then EXTRA_CFLAGS="$EXTRA_CFLAGS $LIBUSB_CFLAGS" @@ -24343,7 +24344,6 @@ $as_echo "#define SDL_JOYSTICK_HIDAPI 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You must have SDL_LoadObject() support for dynamic libusb loading" >&5 $as_echo "$as_me: WARNING: You must have SDL_LoadObject() support for dynamic libusb loading" >&2;} fi - SOURCES="$SOURCES $srcdir/src/hidapi/SDL_hidapi.c" # libusb is loaded dynamically, so don't add it to LDFLAGS libusb_lib="" case "$host" in @@ -24363,8 +24363,6 @@ cat >>confdefs.h <<_ACEOF _ACEOF fi - else - SOURCES="$SOURCES $srcdir/src/hidapi/SDL_hidapi.c" fi fi diff --git a/configure.ac b/configure.ac index b2ae68bed..e906d0d25 100644 --- a/configure.ac +++ b/configure.ac @@ -3326,7 +3326,6 @@ AS_HELP_STRING([--enable-hidapi], [use HIDAPI for low level joystick drivers [[d if test x$have_loadso != xyes; then AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic libusb loading]) fi - SOURCES="$SOURCES $srcdir/src/hidapi/SDL_hidapi.c" # libusb is loaded dynamically, so don't add it to LDFLAGS libusb_lib="" case "$host" in @@ -3342,8 +3341,6 @@ AS_HELP_STRING([--enable-hidapi], [use HIDAPI for low level joystick drivers [[d fi AC_DEFINE_UNQUOTED(SDL_LIBUSB_DYNAMIC, "$libusb_lib", [ ]) fi - else - SOURCES="$SOURCES $srcdir/src/hidapi/SDL_hidapi.c" fi fi