mac build setting
merge
Mac Build
updates for mac build