Merge pull request #1604 from billhollings/update-xcode-build-settings

Update Xcode project build settings.