added the possibility to turn off the --gcc flag under windows
Merge remote-tracking branch 'origin/master'