diff --git a/Makefile.common b/Makefile.common index 4e09fe8dc5..57e91d0c04 100644 --- a/Makefile.common +++ b/Makefile.common @@ -554,7 +554,8 @@ ifeq ($(HAVE_HID), 1) input/connect/connect_wii.o \ input/connect/connect_nesusb.o \ input/connect/connect_snesusb.o \ - input/connect/connect_wiiupro.o + input/connect/connect_wiiupro.o \ + input/connect/connect_wiiugca.o endif ifeq ($(HAVE_PARPORT), 1) diff --git a/griffin/griffin.c b/griffin/griffin.c index b41d832f54..0b3e9a6ffb 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -418,10 +418,8 @@ INPUT (HID) #include "../input/connect/connect_wiiupro.c" #include "../input/connect/connect_snesusb.c" #include "../input/connect/connect_nesusb.c" -#ifdef HAVE_WIIUSB_HID #include "../input/connect/connect_wiiugca.c" #endif -#endif /*============================================================ KEYBOARD EVENT diff --git a/input/connect/joypad_connection.c b/input/connect/joypad_connection.c index bd9df9f10a..4f764751ee 100644 --- a/input/connect/joypad_connection.c +++ b/input/connect/joypad_connection.c @@ -84,9 +84,7 @@ int32_t pad_connection_pad_init(joypad_connection_t *joyconn, { "PLAYSTATION(R)3 Controller", 787, 8406, &pad_connection_ps3 }, { "Generic SNES USB Controller", 2079, 58369, &pad_connection_snesusb }, { "Generic NES USB Controller", 121, 17, &pad_connection_nesusb }, -#ifdef HAVE_WIIUSB_HID { "Wii U GC Controller Adapter", 1406, 823, &pad_connection_wiiugca }, -#endif { 0, 0} }; joypad_connection_t *s = NULL; diff --git a/input/connect/joypad_connection.h b/input/connect/joypad_connection.h index fc966ac033..e56e7476d8 100644 --- a/input/connect/joypad_connection.h +++ b/input/connect/joypad_connection.h @@ -51,9 +51,7 @@ extern pad_connection_interface_t pad_connection_ps3; extern pad_connection_interface_t pad_connection_ps4; extern pad_connection_interface_t pad_connection_snesusb; extern pad_connection_interface_t pad_connection_nesusb; -#ifdef HAVE_WIIUSB_HID extern pad_connection_interface_t pad_connection_wiiugca; -#endif int32_t pad_connection_pad_init(joypad_connection_t *joyconn, const char* name, uint16_t vid, uint16_t pid,