More fixes for windows build script
Merge pull request #12 from dreisch/master

More fixes for windows build script