added newer glm
updated makefile