mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

(MSVC) MSVC build fixes

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/SPIRV-Cross vendored

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

2
input/input_driver.c
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 *general_binds = settings->input.binds[i];
struct retro_keybind *auto_binds = settings->input.autoconf_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) if (dpad_mode == ANALOG_DPAD_NONE)
continue; continue;

6
runloop.c
View File

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