Updates to enable building Linux and MacOSX versions on Windows 7