Merge branch 'master'
Merge branch 'syb'
修正makefile和make.c
Merge branch 'wxc'
Merge branch 'master'