Win32 build adjustments (includes a sdl2 contrib update).

This builds, but crashes on startup; I believe it has to do with the
sdl2 contrib using thread/generic. I'd like to use thread/stdcpp since
we are using C++11 now, but we need to figure out how to get that to
build first.