fix build for windows systems
Merge branch 'master' into sdl2all