Updating for building on OSX. (doesn't compile from waf yet)