Changes in oder to build MAF2 automatically both on X86 and X64 machines