Fix Win32 build.
Take out SPU resampler again
Merge branch 'master' into cd-swap