Rename null joypad driver

This commit is contained in:
twinaphex 2015-04-02 18:44:02 +02:00
parent 37acf75b4c
commit b202d54dd3
3 changed files with 3 additions and 3 deletions

View File

@ -166,7 +166,7 @@ OBJ += frontend/frontend.o \
audio/drivers/nullaudio.o \ audio/drivers/nullaudio.o \
input/drivers/nullinput.o \ input/drivers/nullinput.o \
input/drivers_hid/null_hid.o \ input/drivers_hid/null_hid.o \
input/drivers_joypad/nullinput_joypad.o \ input/drivers_joypad/null_joypad.o \
input/drivers_joypad/hid_joypad.o \ input/drivers_joypad/hid_joypad.o \
playlist.o \ playlist.o \
movie.o \ movie.o \
@ -370,7 +370,7 @@ endif
ifeq ($(HAVE_WINXINPUT), 1) ifeq ($(HAVE_WINXINPUT), 1)
DEFINES += -DHAVE_WINXINPUT -DHAVE_BUILTIN_AUTOCONFIG DEFINES += -DHAVE_WINXINPUT -DHAVE_BUILTIN_AUTOCONFIG
OBJ += input/drivers_joypad/winxinput_joypad.o \ OBJ += input/drivers_joypad/xinput_joypad.o \
input/autoconf/builtin_win.o input/autoconf/builtin_win.o
endif endif

View File

@ -371,7 +371,7 @@ INPUT
#endif #endif
#include "../input/drivers/nullinput.c" #include "../input/drivers/nullinput.c"
#include "../input/drivers_joypad/nullinput_joypad.c" #include "../input/drivers_joypad/null_joypad.c"
/*============================================================ /*============================================================
INPUT (HID) INPUT (HID)