added glm and build dir
Added libpng null defines
Merge branch 'master' into uni