Use nesusb/snesusb for non-Wii too

This commit is contained in:
twinaphex 2016-02-04 23:43:33 +01:00
parent a90c5a9861
commit 407d85f604
6 changed files with 8 additions and 4 deletions

View File

@ -548,10 +548,12 @@ endif
ifeq ($(HAVE_HID), 1)
DEFINES += -DHAVE_HID
OBJ += input/connect/joypad_connection.o \
OBJ += input/connect/joypad_connection.o \
input/connect/connect_ps3.o \
input/connect/connect_ps4.o \
input/connect/connect_wii.o \
input/connect/connect_nesusb.o \
input/connect/connect_snesusb.o \
input/connect/connect_wiiupro.o
endif

View File

@ -416,9 +416,9 @@ INPUT (HID)
#include "../input/connect/connect_ps4.c"
#include "../input/connect/connect_wii.c"
#include "../input/connect/connect_wiiupro.c"
#ifdef HAVE_WIIUSB_HID
#include "../input/connect/connect_snesusb.c"
#include "../input/connect/connect_nesusb.c"
#ifdef HAVE_WIIUSB_HID
#include "../input/connect/connect_wiiugca.c"
#endif
#endif

View File

@ -20,6 +20,7 @@
#include <boolean.h>
#include "joypad_connection.h"
#include "../../driver.h"
struct hidpad_nesusb_data
{

View File

@ -20,6 +20,7 @@
#include <boolean.h>
#include "joypad_connection.h"
#include "../../driver.h"
struct hidpad_snesusb_data
{

View File

@ -82,9 +82,9 @@ int32_t pad_connection_pad_init(joypad_connection_t *joyconn,
{ "Wireless Controller", 1356, 1476, &pad_connection_ps4 },
{ "PLAYSTATION(R)3 Controller", 1356, 616, &pad_connection_ps3 },
{ "PLAYSTATION(R)3 Controller", 787, 8406, &pad_connection_ps3 },
#ifdef HAVE_WIIUSB_HID
{ "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}

View File

@ -49,9 +49,9 @@ extern pad_connection_interface_t pad_connection_wii;
extern pad_connection_interface_t pad_connection_wiiupro;
extern pad_connection_interface_t pad_connection_ps3;
extern pad_connection_interface_t pad_connection_ps4;
#ifdef HAVE_WIIUSB_HID
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