Integrating changes for SDL2 on windows
more sdl and windows