next try to get glm patched on windows and linux

Change-Id: Ia17217db6cbf5110926302611a4b37faeacc9bfd