mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of duplicate dinput_hybrid_joypad.c

Browse Source
This commit is contained in:
twinaphex 2020-08-30 19:41:44 +02:00
parent ea17294ff1
commit 7b0fe59722
3 changed files with 1 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.common
View File

@ -1106,12 +1106,7 @@ ifeq ($(HAVE_DINPUT), 1)
LIBS += -ldinput8 -lole32
DEFINES += -DHAVE_DINPUT
OBJ += input/drivers/dinput.o
ifeq ($(HAVE_XINPUT), 1)
OBJ += input/drivers_joypad/dinput_hybrid_joypad.o
else
OBJ += input/drivers_joypad/dinput_joypad.o
endif
OBJ += input/drivers_joypad/dinput_joypad.o
endif
ifeq ($(HAVE_XINPUT), 1)

4
griffin/griffin.c
View File

@ -748,12 +748,8 @@ INPUT
#ifdef HAVE_DINPUT
#include "../input/drivers/dinput.c"
#ifdef HAVE_XINPUT
#include "../input/drivers_joypad/dinput_hybrid_joypad.c"
#else
#include "../input/drivers_joypad/dinput_joypad.c"
#endif
#endif
#ifdef HAVE_XINPUT
#ifdef HAVE_DINPUT

61
input/drivers_joypad/dinput_hybrid_joypad.c
View File

@ -1,61 +0,0 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2010-2014 - Hans-Kristian Arntzen
* Copyright (C) 2011-2020 - Daniel De Matteis
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
/* Specialized version of dinput_joypad.c,
* has both DirectInput and XInput codepaths */
#include <stdlib.h>
#include <stddef.h>
#include <string.h>
#include <windowsx.h>
#include <dinput.h>
#include <mmsystem.h>
#include <boolean.h>
#include <compat/strl.h>
#include <string/stdstring.h>
#ifdef HAVE_CONFIG_H
#include "../../config.h"
#endif
#include "../../tasks/tasks_internal.h"
#include "../input_keymaps.h"
#include "../../retroarch.h"
#include "../../verbosity.h"
#include "dinput_joypad.h"
/* TODO/FIXME - globals referenced outside */
struct dinput_joypad_data g_pads[MAX_USERS];
unsigned g_joypad_cnt;
#include "dinput_joypad_inl.h"
#include "dinput_joypad_excl.h"
input_device_driver_t dinput_joypad = {
dinput_joypad_init,
dinput_joypad_query_pad,
dinput_joypad_destroy,
dinput_joypad_button,
dinput_joypad_state,
NULL,
dinput_joypad_axis,
dinput_joypad_poll,
dinput_joypad_set_rumble,
dinput_joypad_name,
"dinput",
};