Make it buildable for non-x86 platforms
11 files changed