mirror of
https://github.com/libretro/RetroArch.git
synced 2024-11-27 10:10:57 +00:00
Move joypad drivers to input/drivers_joypad
This commit is contained in:
twinaphex
parent
8146514064
commit
2d66cdc3e7
@ -62,7 +62,7 @@ endif
|
||||
ifneq ($(findstring Linux,$(OS)),)
|
||||
LIBS += -lrt
|
||||
JOYCONFIG_LIBS += -lrt
|
||||
OBJ += input/drivers/linuxraw_input.o input/linuxraw_joypad.o
|
||||
OBJ += input/drivers/linuxraw_input.o input/drivers_joypad/linuxraw_joypad.o
|
||||
endif
|
||||
|
||||
ifeq ($(findstring Haiku,$(OS)),)
|
||||
@ -143,7 +143,7 @@ OBJ += frontend/frontend.o \
|
||||
gfx/nullgfx.o \
|
||||
audio/drivers/nullaudio.o \
|
||||
input/drivers/nullinput.o \
|
||||
input/nullinput_joypad.o \
|
||||
input/drivers_joypad/nullinput_joypad.o \
|
||||
input/osk/nullosk.o \
|
||||
playlist.o \
|
||||
movie.o \
|
||||
@ -334,7 +334,7 @@ endif
|
||||
|
||||
ifeq ($(HAVE_WINXINPUT), 1)
|
||||
DEFINES += -DHAVE_WINXINPUT -DHAVE_BUILTIN_AUTOCONFIG
|
||||
OBJ += input/winxinput_joypad.o \
|
||||
OBJ += input/drivers_joypad/winxinput_joypad.o \
|
||||
input/autoconf/builtin_win.o
|
||||
endif
|
||||
|
||||
@ -354,11 +354,11 @@ ifeq ($(HAVE_UDEV), 1)
|
||||
DEFINES += $(UDEV_CFLAGS)
|
||||
LIBS += $(UDEV_LIBS)
|
||||
JOYCONFIG_LIBS += $(UDEV_LIBS)
|
||||
OBJ += input/drivers/udev_input.o input/udev_joypad.o
|
||||
OBJ += input/drivers/udev_input.o input/drivers_joypad/udev_joypad.o
|
||||
endif
|
||||
|
||||
ifeq ($(HAVE_PARPORT), 1)
|
||||
OBJ += input/parport_joypad.o
|
||||
OBJ += input/drivers_joypad/parport_joypad.o
|
||||
endif
|
||||
|
||||
# Video
|
||||
@ -449,7 +449,7 @@ ifeq ($(HAVE_SDL2), 1)
|
||||
endif
|
||||
|
||||
ifeq ($(HAVE_SDL), 1)
|
||||
OBJ += gfx/sdl_gfx.o input/drivers/sdl_input.o input/sdl_joypad.o audio/drivers/sdl_audio.o
|
||||
OBJ += gfx/sdl_gfx.o input/drivers/sdl_input.o input/drivers_joypad/sdl_joypad.o audio/drivers/sdl_audio.o
|
||||
|
||||
ifeq ($(HAVE_OPENGL), 1)
|
||||
OBJ += gfx/context/sdl_gl_ctx.o
|
||||
@ -461,7 +461,7 @@ ifeq ($(HAVE_SDL), 1)
|
||||
endif
|
||||
|
||||
ifeq ($(HAVE_SDL2), 1)
|
||||
OBJ += gfx/sdl2_gfx.o input/drivers/sdl_input.o input/sdl_joypad.o audio/drivers/sdl_audio.o
|
||||
OBJ += gfx/sdl2_gfx.o input/drivers/sdl_input.o input/drivers_joypad/sdl_joypad.o audio/drivers/sdl_audio.o
|
||||
|
||||
ifeq ($(HAVE_OPENGL), 1)
|
||||
OBJ += gfx/context/sdl_gl_ctx.o
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
#include "../../driver.h"
|
||||
#include <stdlib.h>
|
||||
#include <boolean.h>
|
||||
#include "../general.h"
|
||||
#include "../../general.h"
|
||||
#include <string.h>
|
||||
|
||||
#ifdef GEKKO
|
||||
|
||||
@ -293,22 +293,22 @@ INPUT
|
||||
|
||||
#if defined(__CELLOS_LV2__)
|
||||
#include "../input/drivers/ps3_input.c"
|
||||
#include "../input/ps3_input_joypad.c"
|
||||
#include "../input/drivers_joypad/ps3_input_joypad.c"
|
||||
#include "../input/autoconf/builtin_ps3.c"
|
||||
#elif defined(SN_TARGET_PSP2) || defined(PSP)
|
||||
#include "../input/drivers/psp_input.c"
|
||||
#include "../input/psp_input_joypad.c"
|
||||
#include "../input/drivers_joypad/psp_input_joypad.c"
|
||||
#include "../input/autoconf/builtin_psp.c"
|
||||
#elif defined(GEKKO)
|
||||
#ifdef HAVE_LIBSICKSAXIS
|
||||
#include "../input/gx_input_sicksaxis.c"
|
||||
#include "../input/drivers_joypad/gx_input_sicksaxis.c"
|
||||
#endif
|
||||
#include "../input/drivers/gx_input.c"
|
||||
#include "../input/gx_input_joypad.c"
|
||||
#include "../input/drivers_joypad/gx_input_joypad.c"
|
||||
#include "../input/autoconf/builtin_gx.c"
|
||||
#elif defined(_XBOX)
|
||||
#include "../input/drivers/xdk_xinput_input.c"
|
||||
#include "../input/xdk_xinput_input_joypad.c"
|
||||
#include "../input/drivers_joypad/xdk_xinput_input_joypad.c"
|
||||
#include "../input/autoconf/builtin_xdk.c"
|
||||
#elif defined(_WIN32)
|
||||
#include "../input/autoconf/builtin_win.c"
|
||||
@ -316,12 +316,12 @@ INPUT
|
||||
#include "../input/drivers/xenon360_input.c"
|
||||
#elif defined(ANDROID)
|
||||
#include "../input/drivers/android_input.c"
|
||||
#include "../input/android_input_joypad.c"
|
||||
#include "../input/drivers_joypad/android_input_joypad.c"
|
||||
#elif defined(__APPLE__)
|
||||
#include "../input/drivers/apple_input.c"
|
||||
#elif defined(__QNX__)
|
||||
#include "../input/drivers/qnx_input.c"
|
||||
#include "../input/qnx_input_joypad.c"
|
||||
#include "../input/drivers_joypad/qnx_input_joypad.c"
|
||||
#elif defined(EMSCRIPTEN)
|
||||
#include "../input/drivers/rwebinput_input.c"
|
||||
#endif
|
||||
@ -333,11 +333,11 @@ INPUT
|
||||
#include "../input/connect/connect_wii.c"
|
||||
|
||||
#ifdef HAVE_HID
|
||||
#include "../input/apple_joypad_hid.c"
|
||||
#include "../input/drivers_joypad/apple_joypad_hid.c"
|
||||
#endif
|
||||
|
||||
#ifdef IOS
|
||||
#include "../input/apple_joypad_ios.c"
|
||||
#include "../input/drivers_joypad/apple_joypad_ios.c"
|
||||
#endif
|
||||
|
||||
#endif
|
||||
@ -347,7 +347,7 @@ INPUT
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_WINXINPUT
|
||||
#include "../input/winxinput_joypad.c"
|
||||
#include "../input/drivers_joypad/winxinput_joypad.c"
|
||||
#endif
|
||||
|
||||
#if defined(__CELLOS_LV2__)
|
||||
@ -358,7 +358,7 @@ INPUT
|
||||
|
||||
#if defined(__linux__) && !defined(ANDROID)
|
||||
#include "../input/drivers/linuxraw_input.c"
|
||||
#include "../input/linuxraw_joypad.c"
|
||||
#include "../input/drivers_joypad/linuxraw_joypad.c"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_X11
|
||||
@ -367,11 +367,11 @@ INPUT
|
||||
|
||||
#ifdef HAVE_UDEV
|
||||
#include "../input/drivers/udev_input.c"
|
||||
#include "../input/udev_joypad.c"
|
||||
#include "../input/drivers_joypad/udev_joypad.c"
|
||||
#endif
|
||||
|
||||
#include "../input/drivers/nullinput.c"
|
||||
#include "../input/nullinput_joypad.c"
|
||||
#include "../input/drivers_joypad/nullinput_joypad.c"
|
||||
|
||||
/*============================================================
|
||||
KEYBOARD EVENT
|
||||
|
||||
@ -16,10 +16,10 @@
|
||||
|
||||
#include <IOKit/hid/IOHIDManager.h>
|
||||
#include <IOKit/hid/IOHIDKeys.h>
|
||||
#include "drivers/apple_input.h"
|
||||
#include "input_autodetect.h"
|
||||
#include "input_common.h"
|
||||
#include "../general.h"
|
||||
#include "../drivers/apple_input.h"
|
||||
#include "../input_autodetect.h"
|
||||
#include "../input_common.h"
|
||||
#include "../../general.h"
|
||||
|
||||
struct pad_connection
|
||||
{
|
||||
@ -14,16 +14,16 @@
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "drivers/apple_input.h"
|
||||
#include "input_autodetect.h"
|
||||
#include "input_common.h"
|
||||
#include "../general.h"
|
||||
#include "../apple/common/apple_gamecontroller.h"
|
||||
#include "../drivers/apple_input.h"
|
||||
#include "../input_autodetect.h"
|
||||
#include "../input_common.h"
|
||||
#include "../../general.h"
|
||||
#include "../../apple/common/apple_gamecontroller.h"
|
||||
|
||||
#include "../apple/iOS/bluetooth/btdynamic.c"
|
||||
#include "../apple/iOS/bluetooth/btpad.c"
|
||||
#include "../apple/iOS/bluetooth/btpad_queue.c"
|
||||
#include "connect/joypad_connection.h"
|
||||
#include "../../apple/iOS/bluetooth/btdynamic.c"
|
||||
#include "../../apple/iOS/bluetooth/btpad.c"
|
||||
#include "../../apple/iOS/bluetooth/btpad_queue.c"
|
||||
#include "../connect/joypad_connection.h"
|
||||
|
||||
joypad_connection_t *slots;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "input_autodetect.h"
|
||||
#include "../input_autodetect.h"
|
||||
#ifdef HW_RVL
|
||||
#include <gccore.h>
|
||||
#include <ogc/pad.h>
|
||||
@ -14,9 +14,9 @@
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "input_autodetect.h"
|
||||
#include "input_common.h"
|
||||
#include "../general.h"
|
||||
#include "../input_autodetect.h"
|
||||
#include "../input_common.h"
|
||||
#include "../../general.h"
|
||||
#include <unistd.h>
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
@ -18,7 +18,7 @@
|
||||
#include <stdint.h>
|
||||
#include <stddef.h>
|
||||
#include <boolean.h>
|
||||
#include "input_context.h"
|
||||
#include "../input_context.h"
|
||||
|
||||
static const char *null_joypad_name(unsigned pad)
|
||||
{
|
||||
@ -13,9 +13,9 @@
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "input_autodetect.h"
|
||||
#include "input_common.h"
|
||||
#include "../general.h"
|
||||
#include "../input_autodetect.h"
|
||||
#include "../input_common.h"
|
||||
#include "../../general.h"
|
||||
#include <unistd.h>
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
@ -14,7 +14,7 @@
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "input_autodetect.h"
|
||||
#include "../input_autodetect.h"
|
||||
|
||||
static uint64_t pad_state[MAX_PADS];
|
||||
static int16_t analog_state[MAX_PADS][2][2];
|
||||
@ -14,7 +14,7 @@
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "input_autodetect.h"
|
||||
#include "../input_autodetect.h"
|
||||
|
||||
static uint64_t pad_state;
|
||||
static int16_t analog_state[1][2][2];
|
||||
@ -15,7 +15,7 @@
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "input_autodetect.h"
|
||||
#include "../input_autodetect.h"
|
||||
|
||||
static const char *qnx_joypad_name(unsigned pad)
|
||||
{
|
||||
@ -14,10 +14,10 @@
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "input_autodetect.h"
|
||||
#include "input_common.h"
|
||||
#include "../input_autodetect.h"
|
||||
#include "../input_common.h"
|
||||
#include "SDL.h"
|
||||
#include "../general.h"
|
||||
#include "../../general.h"
|
||||
|
||||
typedef struct _sdl_joypad
|
||||
{
|
||||
@ -13,9 +13,9 @@
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "input_autodetect.h"
|
||||
#include "input_common.h"
|
||||
#include "../general.h"
|
||||
#include "../input_autodetect.h"
|
||||
#include "../input_common.h"
|
||||
#include "../../general.h"
|
||||
#include <unistd.h>
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
@ -20,10 +20,10 @@
|
||||
|
||||
// Some wrappers for other controllers also simulate xinput (as it is easier to implement)
|
||||
// so this may be useful for those also.
|
||||
#include "input_autodetect.h"
|
||||
#include "input_common.h"
|
||||
#include "../input_autodetect.h"
|
||||
#include "../input_common.h"
|
||||
|
||||
#include "../general.h"
|
||||
#include "../../general.h"
|
||||
#include <boolean.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
@ -14,7 +14,7 @@
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "input_autodetect.h"
|
||||
#include "../input_autodetect.h"
|
||||
|
||||
static uint64_t pad_state[MAX_PADS];
|
||||
static int16_t analog_state[MAX_PADS][2][2];
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
#if defined(__linux) && !defined(ANDROID)
|
||||
#include "../input/drivers/linuxraw_input.c"
|
||||
#include "../input/linuxraw_joypad.c"
|
||||
#include "../input/drivers_joypad/linuxraw_joypad.c"
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_DINPUT)
|
||||
@ -26,19 +26,19 @@
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_WINXINPUT)
|
||||
#include "../input/winxinput_joypad.c"
|
||||
#include "../input/drivers_joypad/winxinput_joypad.c"
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_UDEV)
|
||||
#include "../input/udev_joypad.c"
|
||||
#include "../input/drivers_joypad/udev_joypad.c"
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_PARPORT)
|
||||
#include "../input/parport_joypad.c"
|
||||
#include "../input/drivers_joypad/parport_joypad.c"
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_SDL) || defined(HAVE_SDL2)
|
||||
#include "../input/sdl_joypad.c"
|
||||
#include "../input/drivers_joypad/sdl_joypad.c"
|
||||
#endif
|
||||
|
||||
#include "../libretro-sdk/file/config_file.c"
|
||||
@ -47,7 +47,7 @@
|
||||
#include "../libretro-sdk/compat/compat.c"
|
||||
|
||||
#include "../input/drivers/nullinput.c"
|
||||
#include "../input/nullinput_joypad.c"
|
||||
#include "../input/drivers_joypad/nullinput_joypad.c"
|
||||
|
||||
#include "../input/input_context.c"
|
||||
#include "../input/input_joypad.c"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user