more changes to wscript files to catch up with waf 1.6 and fix OS X issues