MX-166 added cmake for s2
Fix up cmake and scons
Geo Progress - remove diskloc, Record, yielding stuff