(MSVC) MSVC build fixes

This commit is contained in:
twinaphex 2016-12-07 05:39:27 +01:00
parent 3cd682c649
commit f6dcfd21cf
3 changed files with 5 additions and 5 deletions

2
deps/SPIRV-Cross vendored

@ -1 +1 @@
Subproject commit cc207e32c8668bfe5a5cc514394e7df8f020ecf6
Subproject commit b9600aa8d3d1ff4c412d316fcd56c0951addcc33

View File

@ -510,7 +510,7 @@ void state_tracker_update_input(uint16_t *input1, uint16_t *input2)
{
struct retro_keybind *general_binds = settings->input.binds[i];
struct retro_keybind *auto_binds = settings->input.autoconf_binds[i];
enum analog_dpad_mode dpad_mode = settings->input.analog_dpad_mode[i];
enum analog_dpad_mode dpad_mode = (enum analog_dpad_mode)settings->input.analog_dpad_mode[i];
if (dpad_mode == ANALOG_DPAD_NONE)
continue;

View File

@ -807,7 +807,7 @@ static enum runloop_state runloop_check_state(
CORE_TYPE_DUMMY,
CONTENT_MODE_LOAD_NOTHING_WITH_DUMMY_CORE,
NULL, NULL))
return -1;
return RUNLOOP_STATE_QUIT;
/* Loads dummy core instead of exiting RetroArch completely.
* Aborts core shutdown if invoked. */
@ -1177,7 +1177,7 @@ int runloop_iterate(unsigned *sleep_ms)
{
struct retro_keybind *general_binds = settings->input.binds[i];
struct retro_keybind *auto_binds = settings->input.autoconf_binds[i];
enum analog_dpad_mode dpad_mode = settings->input.analog_dpad_mode[i];
enum analog_dpad_mode dpad_mode = (enum analog_dpad_mode)settings->input.analog_dpad_mode[i];
if (dpad_mode == ANALOG_DPAD_NONE)
continue;
@ -1201,7 +1201,7 @@ int runloop_iterate(unsigned *sleep_ms)
{
struct retro_keybind *general_binds = settings->input.binds[i];
struct retro_keybind *auto_binds = settings->input.autoconf_binds[i];
enum analog_dpad_mode dpad_mode = settings->input.analog_dpad_mode[i];
enum analog_dpad_mode dpad_mode = (enum analog_dpad_mode)settings->input.analog_dpad_mode[i];
if (dpad_mode == ANALOG_DPAD_NONE)
continue;