Fixed make on x86 & x64 all.