diff --git a/shell/libretro/libretro.cpp b/shell/libretro/libretro.cpp index b81ccc729..30195a820 100644 --- a/shell/libretro/libretro.cpp +++ b/shell/libretro/libretro.cpp @@ -87,7 +87,7 @@ constexpr char slash = path_default_slash_c(); #define RETRO_ENVIRONMENT_POLL_TYPE_OVERRIDE (4 | RETRO_ENVIRONMENT_RETROARCH_START_BLOCK) /* unsigned * -- - * Tells the frontend to override the poll type behavior. + * Tells the frontend to override the poll type behavior. * Allows the frontend to influence the polling behavior of the * frontend. * @@ -373,7 +373,7 @@ void retro_deinit() std::lock_guard lock(mtx_serialization); } os_UninstallFaultHandler(); - + #if defined(__APPLE__) || (defined(__GNUC__) && defined(__linux__) && !defined(__ANDROID__)) addrspace::release(); #else @@ -2026,7 +2026,7 @@ static bool set_dx11_hw_render() // Loading/unloading games bool retro_load_game(const struct retro_game_info *game) { -#if defined(IOS) +#if defined(IOS) && !defined(NO_JIT) bool can_jit; if (environ_cb(RETRO_ENVIRONMENT_GET_JIT_CAPABLE, &can_jit) && !can_jit) { // jit is required both for performance and for audio. trying to run @@ -3023,9 +3023,9 @@ static void UpdateInputState(u32 port) setDeviceButtonStateDirect(ret, port, RETRO_DEVICE_ID_JOYPAD_A, DC_BTN_B ); setDeviceButtonStateDirect(ret, port, RETRO_DEVICE_ID_JOYPAD_Y, DC_BTN_X ); setDeviceButtonStateDirect(ret, port, RETRO_DEVICE_ID_JOYPAD_X, DC_BTN_Y ); - setDeviceButtonStateDirect2(ret, port, RETRO_DEVICE_ID_JOYPAD_L, + setDeviceButtonStateDirect2(ret, port, RETRO_DEVICE_ID_JOYPAD_L, RETRO_DEVICE_ID_JOYPAD_L2, DC_BTN_Z ); - setDeviceButtonStateDirect2(ret, port, RETRO_DEVICE_ID_JOYPAD_R, + setDeviceButtonStateDirect2(ret, port, RETRO_DEVICE_ID_JOYPAD_R, RETRO_DEVICE_ID_JOYPAD_R2, DC_BTN_C ); setDeviceButtonStateDirect(ret, port, RETRO_DEVICE_ID_JOYPAD_START, DC_BTN_START ); @@ -3041,7 +3041,7 @@ static void UpdateInputState(u32 port) { int16_t ret = 0; kcode[port] = 0xFFFF; // active-low - + if ( device_type[port] == RETRO_DEVICE_TWINSTICK_SATURN ) { // NOTE: This is a remapping of the RetroPad layout in the block below to make using a real