Build system changes to allow for both 32bit and 64bit installer generation