xcpu2 pulled the spfs and npfs libraries from sourceforge whereas the sxcpu branch had local copies of them. over time, there were a few changes done to both the versions in parallel. i have done best to resolve them and make sxcpu pull the libraries from sourceforge.
it's looking fine with my tests. let me know if there's something that fails for you -- it might possibly be because of this. thanks! p.s.: all these changes are being done on the XCPU sourceforge repositories, and not the xcpu.org svn repo. kindly pull from these to stay up-to-date.
