mirror of
https://github.com/libretro/RetroArch
synced 2025-01-29 00:32:49 +00:00
Build fix for PC
== DETAILS Hooray for conditional compile directives. Moving things around broke things in unexpected ways on non-WiiU builds. Well, not *completely* unexpected. But still. Changes: - Move some typedefs around to avoid circular include dependencies - Include the file where the HID driver definition got moved to == TESTING - verified build for Wii U still runs successfully - did a local build without any errors (some weird warnings, but since they happen in code I didn't change, I'm assuming they're pre-existing?)
This commit is contained in:
parent
4cd301bd92
commit
6eebbe4213
@ -64,8 +64,6 @@ typedef struct pad_connection_interface
|
||||
bool (*button)(void *data, uint16_t joykey);
|
||||
} pad_connection_interface_t;
|
||||
|
||||
typedef struct joypad_connection joypad_connection_t;
|
||||
|
||||
extern pad_connection_interface_t pad_connection_wii;
|
||||
extern pad_connection_interface_t pad_connection_wiiupro;
|
||||
extern pad_connection_interface_t pad_connection_ps3;
|
||||
|
@ -38,23 +38,11 @@
|
||||
|
||||
#include "../msg_hash.h"
|
||||
#include "include/hid_types.h"
|
||||
#include "include/hid_driver.h"
|
||||
#include "include/gamepad.h"
|
||||
|
||||
RETRO_BEGIN_DECLS
|
||||
|
||||
typedef struct
|
||||
{
|
||||
uint32_t data[8];
|
||||
uint16_t analogs[8];
|
||||
} input_bits_t;
|
||||
|
||||
typedef struct rarch_joypad_driver input_device_driver_t;
|
||||
|
||||
typedef struct hid_driver hid_driver_t;
|
||||
|
||||
/* Keyboard line reader. Handles textual input in a direct fashion. */
|
||||
typedef struct input_keyboard_line input_keyboard_line_t;
|
||||
|
||||
enum input_device_type
|
||||
{
|
||||
INPUT_DEVICE_TYPE_NONE = 0,
|
||||
@ -621,6 +609,9 @@ const char *input_joypad_name(const input_device_driver_t *driver,
|
||||
bool input_config_get_bind_idx(unsigned port, unsigned *joy_idx_real);
|
||||
|
||||
#ifdef HAVE_HID
|
||||
|
||||
#include "include/hid_driver.h"
|
||||
|
||||
/**
|
||||
* hid_driver_find_handle:
|
||||
* @index : index of driver to get handle to.
|
||||
|
@ -22,5 +22,10 @@ typedef struct input_keyboard_line input_keyboard_line_t;
|
||||
typedef struct rarch_joypad_info rarch_joypad_info_t;
|
||||
typedef struct input_driver input_driver_t;
|
||||
typedef struct input_keyboard_ctx_wait input_keyboard_ctx_wait_t;
|
||||
typedef struct {
|
||||
uint32_t data[8];
|
||||
uint16_t analogs[8];
|
||||
} input_bits_t;
|
||||
typedef struct joypad_connection joypad_connection_t;
|
||||
|
||||
#endif /* __INPUT_TYPES__H */
|
||||
|
Loading…
x
Reference in New Issue
Block a user