Further improved Windows build script