Build system changes for windows and Cygwin