Mostly update the windows build script.

Minor changes to linux build