updated builds system for win
merged with prev commit