Update Mac build configuration

[panupan]

Could you please verify that this doesn't affect the Windows build. I'm getting a Windows machine setup in the meantime.