mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make HAVE_HID completely optional

Browse Source
This commit is contained in:
twinaphex 2016-06-07 03:01:33 +02:00
parent d5db2a940a
commit d44062d841
5 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.common
View File

@ -18,6 +18,10 @@ ifeq ($(HAVE_LIBRETRODB),)
HAVE_LIBRETRODB = 1 HAVE_LIBRETRODB = 1
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
@ -154,7 +158,6 @@ OBJ += frontend/frontend.o \
libretro-common/hash/rhash.o \ libretro-common/hash/rhash.o \
audio/audio_driver.o \ audio/audio_driver.o \
input/input_driver.o \ input/input_driver.o \
input/input_hid_driver.o \
gfx/video_coord_array.o \ gfx/video_coord_array.o \
gfx/video_driver.o \ gfx/video_driver.o \
camera/camera_driver.o \ camera/camera_driver.o \
@ -206,7 +209,6 @@ OBJ += frontend/frontend.o \
input/drivers/nullinput.o \ input/drivers/nullinput.o \
input/drivers_hid/null_hid.o \ input/drivers_hid/null_hid.o \
input/drivers_joypad/null_joypad.o \ input/drivers_joypad/null_joypad.o \
input/drivers_joypad/hid_joypad.o \
playlist.o \ playlist.o \
movie.o \ movie.o \
record/record_driver.o \ record/record_driver.o \
@ -595,19 +597,21 @@ endif
ifeq ($(HAVE_LIBUSB), 1) ifeq ($(HAVE_LIBUSB), 1)
ifeq ($(HAVE_THREADS), 1) ifeq ($(HAVE_THREADS), 1)
ifeq ($(HAVE_HID), 1)
DEFINES += -DHAVE_LIBUSB DEFINES += -DHAVE_LIBUSB
OBJ += input/drivers_hid/libusb_hid.o OBJ += input/drivers_hid/libusb_hid.o
LIBS += -lusb-1.0 LIBS += -lusb-1.0
HAVE_HID = 1 endif
endif endif
endif endif
ifeq ($(HAVE_IOHIDMANAGER), 1) ifeq ($(HAVE_IOHIDMANAGER), 1)
ifeq ($(HAVE_HID), 1)
DEFINES += -DHAVE_IOHIDMANAGER DEFINES += -DHAVE_IOHIDMANAGER
OBJ += input/drivers_hid/iohidmanager_hid.o OBJ += input/drivers_hid/iohidmanager_hid.o
HAVE_HID = 1
LIBS += -framework IOKit LIBS += -framework IOKit
endif endif
endif
ifeq ($(HAVE_CORELOCATION), 1) ifeq ($(HAVE_CORELOCATION), 1)
DEFINES += -DHAVE_CORELOCATION DEFINES += -DHAVE_CORELOCATION
@ -616,7 +620,9 @@ endif
ifeq ($(HAVE_HID), 1) ifeq ($(HAVE_HID), 1)
DEFINES += -DHAVE_HID DEFINES += -DHAVE_HID
OBJ += input/connect/joypad_connection.o \ OBJ += input/input_hid_driver.o \
input/drivers_joypad/hid_joypad.o \
input/connect/joypad_connection.o \
input/connect/connect_ps2adapter.o \ input/connect/connect_ps2adapter.o \
input/connect/connect_ps3.o \ input/connect/connect_ps3.o \
input/connect/connect_ps4.o \ input/connect/connect_ps4.o \

2
griffin/griffin.c
View File

@ -442,6 +442,7 @@ INPUT (HID)
============================================================ */ ============================================================ */
#include "../input/drivers_joypad/hid_joypad.c" #include "../input/drivers_joypad/hid_joypad.c"
#ifdef HAVE_HID
#include "../input/drivers_hid/null_hid.c" #include "../input/drivers_hid/null_hid.c"
#if defined(HAVE_LIBUSB) && defined(HAVE_THREADS) #if defined(HAVE_LIBUSB) && defined(HAVE_THREADS)
@ -460,7 +461,6 @@ INPUT (HID)
#include "../input/drivers_hid/wiiusb_hid.c" #include "../input/drivers_hid/wiiusb_hid.c"
#endif #endif
#ifdef HAVE_HID
#include "../input/connect/joypad_connection.c" #include "../input/connect/joypad_connection.c"
#include "../input/connect/connect_ps3.c" #include "../input/connect/connect_ps3.c"
#include "../input/connect/connect_ps4.c" #include "../input/connect/connect_ps4.c"

2
input/input_joypad_driver.c
View File

@ -68,7 +68,9 @@ static input_device_driver_t *joypad_drivers[] = {
#ifdef HAVE_MFI #ifdef HAVE_MFI
&mfi_joypad, &mfi_joypad,
#endif #endif
#ifdef HAVE_HID
&hid_joypad, &hid_joypad,
#endif
&null_joypad, &null_joypad,
NULL, NULL,
}; };

2
list_special.c
View File

@ -202,6 +202,7 @@ struct string_list *string_list_new_special(enum string_list_type type,
} }
break; break;
case STRING_LIST_INPUT_HID_DRIVERS: case STRING_LIST_INPUT_HID_DRIVERS:
#ifdef HAVE_HID
for (i = 0; hid_driver_find_handle(i); i++) for (i = 0; hid_driver_find_handle(i); i++)
{ {
const char *opt = hid_driver_find_ident(i); const char *opt = hid_driver_find_ident(i);
@ -209,6 +210,7 @@ struct string_list *string_list_new_special(enum string_list_type type,
string_list_append(s, opt, attr); string_list_append(s, opt, attr);
} }
#endif
break; break;
case STRING_LIST_INPUT_JOYPAD_DRIVERS: case STRING_LIST_INPUT_JOYPAD_DRIVERS:
for (i = 0; joypad_driver_find_handle(i); i++) for (i = 0; joypad_driver_find_handle(i); i++)

1
qb/config.params.sh
View File

@ -82,3 +82,4 @@ HAVE_RPNG=yes # RPNG support
HAVE_RBMP=yes # RBMP support HAVE_RBMP=yes # RBMP support
HAVE_RJPEG=yes # RJPEG support HAVE_RJPEG=yes # RJPEG support
HAVE_RTGA=yes # RTGA support HAVE_RTGA=yes # RTGA support
HAVE_HID=yes # Low-level HID (Human Interface Device) support