Merge SDL2.0.1 build script changes