mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 14:19:46 -06:00
Linux build fix ... again.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5941 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
1
Externals/WiiUseSrc/Src/io_nix.c
vendored
1
Externals/WiiUseSrc/Src/io_nix.c
vendored
@ -313,7 +313,6 @@ static int wiiuse_connect_single(struct wiimote_t* wm, char* address) {
|
|||||||
WIIMOTE_ENABLE_STATE(wm, WIIMOTE_STATE_CONNECTED);
|
WIIMOTE_ENABLE_STATE(wm, WIIMOTE_STATE_CONNECTED);
|
||||||
|
|
||||||
wiiuse_set_report_type(wm);
|
wiiuse_set_report_type(wm);
|
||||||
wiiuse_handshake(wm, NULL, 0);
|
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
28
Externals/WiiUseSrc/Src/wiiuse.h
vendored
28
Externals/WiiUseSrc/Src/wiiuse.h
vendored
@ -249,34 +249,6 @@ typedef enum aspect_t {
|
|||||||
WIIUSE_ASPECT_16_9
|
WIIUSE_ASPECT_16_9
|
||||||
} aspect_t;
|
} aspect_t;
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @struct ir_t
|
|
||||||
* @brief IR struct. Hold all data related to the IR tracking.
|
|
||||||
*/
|
|
||||||
typedef struct ir_t {
|
|
||||||
struct ir_dot_t dot[4]; /**< IR dots */
|
|
||||||
byte num_dots; /**< number of dots at this time */
|
|
||||||
|
|
||||||
enum aspect_t aspect; /**< aspect ratio of the screen */
|
|
||||||
|
|
||||||
enum ir_position_t pos; /**< IR sensor bar position */
|
|
||||||
|
|
||||||
unsigned int vres[2]; /**< IR virtual screen resolution */
|
|
||||||
int offset[2]; /**< IR XY correction offset */
|
|
||||||
int state; /**< keeps track of the IR state */
|
|
||||||
|
|
||||||
int ax; /**< absolute X coordinate */
|
|
||||||
int ay; /**< absolute Y coordinate */
|
|
||||||
|
|
||||||
int x; /**< calculated X coordinate */
|
|
||||||
int y; /**< calculated Y coordinate */
|
|
||||||
|
|
||||||
float distance; /**< pixel distance between first 2 dots*/
|
|
||||||
float z; /**< calculated distance */
|
|
||||||
} ir_t;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @struct joystick_t
|
* @struct joystick_t
|
||||||
* @brief Joystick calibration structure.
|
* @brief Joystick calibration structure.
|
||||||
|
@ -525,6 +525,7 @@ void Shutdown(void)
|
|||||||
// Clean up wiiuse
|
// Clean up wiiuse
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
wiiuse_cleanup(g_WiiMotesFromWiiUse, g_NumberOfWiiMotes);
|
wiiuse_cleanup(g_WiiMotesFromWiiUse, g_NumberOfWiiMotes);
|
||||||
|
g_WiiMotesFromWiiUse = NULL;
|
||||||
#endif
|
#endif
|
||||||
// Uninitialized
|
// Uninitialized
|
||||||
g_RealWiiMoteInitialized = false;
|
g_RealWiiMoteInitialized = false;
|
||||||
|
Reference in New Issue
Block a user