mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 16:13:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some CXX_BUILD errors

Browse Source
This commit is contained in:
twinaphex 2019-01-12 18:35:14 +01:00
parent d412c9f8d4
commit 4c8e5e07c0
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/drivers/gl.c
View File

@ -367,10 +367,11 @@ static void gl_set_viewport_wrapper(void *data, unsigned viewport_width,
unsigned viewport_height, bool force_full, bool allow_rotate) unsigned viewport_height, bool force_full, bool allow_rotate)
{ {
video_frame_info_t video_info; video_frame_info_t video_info;
gl_t *gl = (gl_t*)data;
video_driver_build_info(&video_info); video_driver_build_info(&video_info);
gl_set_viewport(data, &video_info, gl_set_viewport(gl, &video_info,
viewport_width, viewport_height, force_full, allow_rotate); viewport_width, viewport_height, force_full, allow_rotate);
} }

12
input/drivers_joypad/dinput_joypad.c
View File

@ -160,15 +160,27 @@ static void dinput_create_rumble_effects(struct dinput_joypad_data *pad)
pad->rumble_props.rgdwAxes = &axis; pad->rumble_props.rgdwAxes = &axis;
pad->rumble_props.rglDirection = &direction; pad->rumble_props.rglDirection = &direction;
#ifdef __cplusplus
if (IDirectInputDevice8_CreateEffect(pad->joypad, GUID_ConstantForce,
&pad->rumble_props, &pad->rumble_iface[0], NULL) != DI_OK)
RARCH_WARN("[DINPUT]: Strong rumble unavailable.\n");
#else
if (IDirectInputDevice8_CreateEffect(pad->joypad, &GUID_ConstantForce, if (IDirectInputDevice8_CreateEffect(pad->joypad, &GUID_ConstantForce,
&pad->rumble_props, &pad->rumble_iface[0], NULL) != DI_OK) &pad->rumble_props, &pad->rumble_iface[0], NULL) != DI_OK)
RARCH_WARN("[DINPUT]: Strong rumble unavailable.\n"); RARCH_WARN("[DINPUT]: Strong rumble unavailable.\n");
#endif
axis = DIJOFS_Y; axis = DIJOFS_Y;
#ifdef __cplusplus
if (IDirectInputDevice8_CreateEffect(pad->joypad, GUID_ConstantForce,
&pad->rumble_props, &pad->rumble_iface[1], NULL) != DI_OK)
RARCH_WARN("[DINPUT]: Weak rumble unavailable.\n");
#else
if (IDirectInputDevice8_CreateEffect(pad->joypad, &GUID_ConstantForce, if (IDirectInputDevice8_CreateEffect(pad->joypad, &GUID_ConstantForce,
&pad->rumble_props, &pad->rumble_iface[1], NULL) != DI_OK) &pad->rumble_props, &pad->rumble_iface[1], NULL) != DI_OK)
RARCH_WARN("[DINPUT]: Weak rumble unavailable.\n"); RARCH_WARN("[DINPUT]: Weak rumble unavailable.\n");
#endif
} }
static BOOL CALLBACK enum_axes_cb( static BOOL CALLBACK enum_axes_cb(