Really fixed makefile. Reinstated glfw code.