Doesn't need G3D
Merge branch 'master' of https://github.com/sidch/CMake