解决win32和mac编译环境问题
modified
xiao gai dong
modified
Merge branch 'master' of https://github.com/pzhifeng/client-main into tmp

Conflicts:
	client-main/Classes/core/CommandsRegister.cpp