fixup SDL2 compilation
Merge branch 'master' of git://github.com/wesnoth/wesnoth