Merge branch 'sdl2' into glide

Manually fix glide makefile for sdl2 compatibility.