Updated Makevars.win