Merge pull request #154 from natural-law/develop

Modify the logic of compiling for iOS & Mac.