Updated Macintosh and Amstrad CPC <platform> tags.
Changed building ES to set CMake's C++ compiler variable directly instead of going through an environment variable.
Merge pull request #328 from Aloshi/reorganization

Updated Macintosh and Amstrad CPC <platform> tags.