Updated Macintosh and Amstrad CPC <platform> tags.

Also changed building ES to set CMake's C++ compiler variable directly instead of going through an environment variable.