mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9153 from orbea/hid

Browse Source 
Fix --disable-hid.
This commit is contained in:
Twinaphex 2019-07-21 18:49:14 +02:00 committed by GitHub
commit 9d287a4311
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile.common
View File

@ -39,10 +39,6 @@ ifeq ($(HAVE_SOCKET_LEGACY), 1)
DEFINES += -DHAVE_SOCKET_LEGACY DEFINES += -DHAVE_SOCKET_LEGACY
endif endif
ifeq ($(HAVE_HID), 1)
DEFINES += -DHAVE_HID
endif
ifeq ($(HAVE_LIBRETRODB), 1) ifeq ($(HAVE_LIBRETRODB), 1)
DEFINES += -DHAVE_LIBRETRODB DEFINES += -DHAVE_LIBRETRODB
endif endif
@ -1014,17 +1010,10 @@ ifeq ($(HAVE_UDEV), 1)
endif endif
ifeq ($(HAVE_LIBUSB), 1) ifeq ($(HAVE_LIBUSB), 1)
ifeq ($(HAVE_THREADS), 1) DEFINES += -DHAVE_LIBUSB
ifeq ($(HAVE_HID), 1) OBJ += input/drivers_hid/libusb_hid.o
DEFINES += -DHAVE_LIBUSB DEF_FLAGS += $(LIBUSB_CFLAGS)
OBJ += input/drivers_hid/libusb_hid.o LIBS += $(LIBUSB_LIBS)
ifneq ($(findstring BSD,$(OS)),)
LIBS += -lusb
else
LIBS += -lusb-1.0
endif
endif
endif
endif endif
ifeq ($(HAVE_IOHIDMANAGER), 1) ifeq ($(HAVE_IOHIDMANAGER), 1)

1
qb/config.libs.sh
View File

@ -300,6 +300,7 @@ if [ "$HAVE_SSL" != 'no' ]; then
fi fi
check_enabled THREADS LIBUSB libusb 'Threads are' false check_enabled THREADS LIBUSB libusb 'Threads are' false
check_enabled HID LIBUSB libusb 'HID is' false
check_val '' LIBUSB -lusb-1.0 libusb-1.0 libusb-1.0 1.0.13 '' false check_val '' LIBUSB -lusb-1.0 libusb-1.0 libusb-1.0 1.0.13 '' false
check_lib '' DINPUT -ldinput8 check_lib '' DINPUT -ldinput8