Add x86 and shared