f6af8fc685
PlayerOptions is still organized differently (keep it this way, it's better). (ControllerStateDisplay isn't in Linux Makefile, hence its absence here... dunno if we're gonna bother keeping it or not.)