Buildfix from fez-sdl2 merge