cross-platform work, updated freetype
Merge branch 'master' of git@github.com:kavendek/DSK.git