Add support for ~x86, changed S2API dependency to build-time only.