Change CPP (meaning C PreProcesor, not C Plus Plus) to CXX in Makefile
Merge branch 'master' into sdl2

Conflicts:
	Makefile