Cleanup
vcx fix
Merge branch 'master' of https://github.com/makotech222/ppsspp