Win32 buildfix, update for upstream SDL2