Improve the OSX Bundle module compatibility to fully support both Unix and Xcode generators