ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Buildfixes

This commit is contained in:
twinaphex 2017-08-10 21:22:30 +02:00
parent 5d12368c83
commit 805c2ad529
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/drivers/dsound.c
View File

@ -322,7 +322,7 @@ static void *dsound_init(const char *device, unsigned rate, unsigned latency,
RARCH_LOG("DirectSound devices:\n"); RARCH_LOG("DirectSound devices:\n");
#ifndef _XBOX #ifndef _XBOX
DirectSoundEnumerate(enumerate_cb, &dev); DirectSoundEnumerate((LPDSENUMCALLBACKW)enumerate_cb, &dev);
#endif #endif
if (DirectSoundCreate(dev.guid, &ds->ds, NULL) != DS_OK) if (DirectSoundCreate(dev.guid, &ds->ds, NULL) != DS_OK)

4
input/drivers_joypad/dinput_joypad.c
View File

@ -225,8 +225,8 @@ static BOOL CALLBACK enum_joypad_cb(const DIDEVICEINSTANCE *inst, void *p)
#endif #endif
return DIENUM_CONTINUE; return DIENUM_CONTINUE;
g_pads[g_joypad_cnt].joy_name = strdup(inst->tszProductName); g_pads[g_joypad_cnt].joy_name = strdup((const char*)inst->tszProductName);
g_pads[g_joypad_cnt].joy_friendly_name = strdup(inst->tszInstanceName); g_pads[g_joypad_cnt].joy_friendly_name = strdup((const char*)inst->tszInstanceName);
/* there may be more useful info in the GUID so leave this here for a while */ /* there may be more useful info in the GUID so leave this here for a while */
#if 0 #if 0

5
input/input_overlay.c
View File

@ -761,12 +761,13 @@ void input_state_overlay(input_overlay_t *ol, int16_t *ret,
static bool input_overlay_add_inputs(input_overlay_t *ol, static bool input_overlay_add_inputs(input_overlay_t *ol,
unsigned port, unsigned analog_dpad_mode) unsigned port, unsigned analog_dpad_mode)
{ {
int i; unsigned i;
uint64_t mask; uint64_t mask;
int id; int id;
bool button_pressed = false; bool button_pressed = false;
bool current_button_pressed; bool current_button_pressed = false;
input_overlay_state_t *ol_state = &ol->overlay_state; input_overlay_state_t *ol_state = &ol->overlay_state;
if(!ol_state) if(!ol_state)
return false; return false;

2
ui/drivers/ui_win32.c
View File

@ -286,7 +286,7 @@ void shader_dlg_params_reload(void)
SendMessage(control->trackbar.label_title, WM_SETFONT, (WPARAM)hFont, MAKELPARAM(TRUE, 0)); SendMessage(control->trackbar.label_title, WM_SETFONT, (WPARAM)hFont, MAKELPARAM(TRUE, 0));
pos_y += SHADER_DLG_LABEL_HEIGHT; pos_y += SHADER_DLG_LABEL_HEIGHT;
control->trackbar.hwnd = CreateWindowEx(0, TRACKBAR_CLASS, "", control->trackbar.hwnd = CreateWindowEx(0, (LPCSTR)TRACKBAR_CLASS, "",
WS_CHILD | WS_VISIBLE | TBS_HORZ | TBS_NOTICKS, WS_CHILD | WS_VISIBLE | TBS_HORZ | TBS_NOTICKS,
pos_x + SHADER_DLG_TRACKBAR_LABEL_WIDTH, pos_y, pos_x + SHADER_DLG_TRACKBAR_LABEL_WIDTH, pos_y,
SHADER_DLG_TRACKBAR_WIDTH, SHADER_DLG_TRACKBAR_HEIGHT, SHADER_DLG_TRACKBAR_WIDTH, SHADER_DLG_TRACKBAR_HEIGHT,