merge makefile for 32 and 64 bit