- Merge all patches from @andreiled
- Add withoutSPH option to allow standalone build without SPH-specific code