commit before fixing sdlmain and sdl_mapper for upgrade to SDL 2.0