ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use wiiugca for non-Wii too

This commit is contained in:
twinaphex 2016-02-04 23:49:04 +01:00
parent 407d85f604
commit 24f5275001
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.common
View File

@ -554,7 +554,8 @@ ifeq ($(HAVE_HID), 1)
input/connect/connect_wii.o \ input/connect/connect_wii.o \
input/connect/connect_nesusb.o \ input/connect/connect_nesusb.o \
input/connect/connect_snesusb.o \ input/connect/connect_snesusb.o \
input/connect/connect_wiiupro.o input/connect/connect_wiiupro.o \
input/connect/connect_wiiugca.o
endif endif
ifeq ($(HAVE_PARPORT), 1) ifeq ($(HAVE_PARPORT), 1)

2
griffin/griffin.c
View File

@ -418,10 +418,8 @@ INPUT (HID)
#include "../input/connect/connect_wiiupro.c" #include "../input/connect/connect_wiiupro.c"
#include "../input/connect/connect_snesusb.c" #include "../input/connect/connect_snesusb.c"
#include "../input/connect/connect_nesusb.c" #include "../input/connect/connect_nesusb.c"
#ifdef HAVE_WIIUSB_HID
#include "../input/connect/connect_wiiugca.c" #include "../input/connect/connect_wiiugca.c"
#endif #endif
#endif
/*============================================================ /*============================================================
KEYBOARD EVENT KEYBOARD EVENT

2
input/connect/joypad_connection.c
View File

@ -84,9 +84,7 @@ int32_t pad_connection_pad_init(joypad_connection_t *joyconn,
{ "PLAYSTATION(R)3 Controller", 787, 8406, &pad_connection_ps3 }, { "PLAYSTATION(R)3 Controller", 787, 8406, &pad_connection_ps3 },
{ "Generic SNES USB Controller", 2079, 58369, &pad_connection_snesusb }, { "Generic SNES USB Controller", 2079, 58369, &pad_connection_snesusb },
{ "Generic NES USB Controller", 121, 17, &pad_connection_nesusb }, { "Generic NES USB Controller", 121, 17, &pad_connection_nesusb },
#ifdef HAVE_WIIUSB_HID
{ "Wii U GC Controller Adapter", 1406, 823, &pad_connection_wiiugca }, { "Wii U GC Controller Adapter", 1406, 823, &pad_connection_wiiugca },
#endif
{ 0, 0} { 0, 0}
}; };
joypad_connection_t *s = NULL; joypad_connection_t *s = NULL;

2
input/connect/joypad_connection.h
View File

@ -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_ps4;
extern pad_connection_interface_t pad_connection_snesusb; extern pad_connection_interface_t pad_connection_snesusb;
extern pad_connection_interface_t pad_connection_nesusb; extern pad_connection_interface_t pad_connection_nesusb;
#ifdef HAVE_WIIUSB_HID
extern pad_connection_interface_t pad_connection_wiiugca; extern pad_connection_interface_t pad_connection_wiiugca;
#endif
int32_t pad_connection_pad_init(joypad_connection_t *joyconn, int32_t pad_connection_pad_init(joypad_connection_t *joyconn,
const char* name, uint16_t vid, uint16_t pid, const char* name, uint16_t vid, uint16_t pid,