makevars for win updated